diff options
author | der richter <der.richter@gmx.de> | 2019-12-01 21:08:54 +0100 |
---|---|---|
committer | der richter <der.richter@gmx.de> | 2019-12-15 20:07:11 +0100 |
commit | f21a980e374b46c978cec0d99145777653f4caca (patch) | |
tree | 54ba33824ad58c5a11b20ff6dfcb4753c0dc1340 /video/out/cocoa_cb_common.swift | |
parent | c8cc203735d73f62def2692d1027f45ac10c03db (diff) | |
download | mpv-f21a980e374b46c978cec0d99145777653f4caca.tar.bz2 mpv-f21a980e374b46c978cec0d99145777653f4caca.tar.xz |
cocoa-cb: update and add more options to use new options handling
this updates and add the maximized, minimized, keepaspect and ontop
options to use the new options handling
Diffstat (limited to 'video/out/cocoa_cb_common.swift')
-rw-r--r-- | video/out/cocoa_cb_common.swift | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift index aa1315fbbf..6e016812ab 100644 --- a/video/out/cocoa_cb_common.swift +++ b/video/out/cocoa_cb_common.swift @@ -58,8 +58,6 @@ class CocoaCB: NSObject { super.init() layer = VideoLayer(cocoaCB: self) - libmpv.observeFlag("ontop") - libmpv.observeFlag("keepaspect-window") libmpv.observeString("macos-title-bar-style") libmpv.observeString("macos-title-bar-appearance") libmpv.observeString("macos-title-bar-material") @@ -459,6 +457,26 @@ class CocoaCB: NSObject { ccb.window?.toggleFullScreen(nil) } } + if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.ontop) { + DispatchQueue.main.async { + ccb.window?.setOnTop(Bool(mpv.opts.ontop), Int(mpv.opts.ontop_level)) + } + } + if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.keepaspect_window) { + DispatchQueue.main.async { + ccb.window?.keepAspect = Bool(mpv.opts.keepaspect_window) + } + } + if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.window_minimized) { + DispatchQueue.main.async { + ccb.window?.setMinimized(Bool(mpv.opts.window_minimized)) + } + } + if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.window_maximized) { + DispatchQueue.main.async { + ccb.window?.setMaximized(Bool(mpv.opts.window_maximized)) + } + } } return VO_TRUE case VOCTRL_GET_DISPLAY_FPS: @@ -574,14 +592,6 @@ class CocoaCB: NSObject { } switch String(cString: property.name) { - case "ontop": - if let data = LibmpvHelper.mpvFlagToBool(property.data) { - window?.setOnTop(data, Int(mpv?.opts.ontop_level ?? -1)) - } - case "keepaspect-window": - if let data = LibmpvHelper.mpvFlagToBool(property.data) { - window?.keepAspect = data - } case "macos-title-bar-appearance": if let data = LibmpvHelper.mpvStringArrayToString(property.data) { titleBar?.set(appearance: data) |