generalisations

Author: Akemi

video/out/mac_common.swift

@@ -35,74 +35,29 @@ class MacCommon: Common {
                 layer?.displaySyncEnabled = true
             }
 
-            startDisplayLink(vo)
-            initLightSensor()
-            addDisplayReconfigureObserver()
+            initMisc(vo)
         }
     }
 
     @objc func config(_ vo: UnsafeMutablePointer<vo>) -> Bool {
         mpv?.vo = vo
 
         DispatchQueue.main.sync {
-            NSApp.setActivationPolicy(.regular)
-            setAppIcon()
+            initApp()
+
+            let (mpv, _, wr) = getInitProperties(vo)
 
-            guard let mpv = mpv else {
-                // TODO log helper refactor
-                //log.sendWarning("Unexpected nil value in Control Callback")
-                exit(1)
-            }
             guard let layer = self.layer else {
-                log.sendError("Something went wrong, no Video was initialized")
-                exit(1)
-            }
-            guard let targetScreen = getScreenBy(id: Int(mpv.opts.screen_id)) ?? NSScreen.main else {
-                log.sendError("Something went wrong, no Screen was found")
+                log.sendError("Something went wrong, no MetalLayer was initialized")
                 exit(1)
             }
 
             print(mpv.vout.dwidth)
             print(mpv.vout.dheight)
 
-            let wr = getWindowGeometry(forScreen: targetScreen, videoOut: vo)
             if window == nil {
-                view = EventsView(frame: wr, common: self)
-                guard let view = self.view else {
-                    log.sendError("Something went wrong, no View was initialized")
-                    exit(1)
-                }
-
-                window = Window(contentRect: wr, screen: targetScreen, view: view, common: self)
-                guard let window = self.window else {
-                    log.sendError("Something went wrong, no Window was initialized")
-                    exit(1)
-                }
-
-                view.layer = layer
-                view.wantsLayer = true
-                view.layerContentsPlacement = .scaleProportionallyToFit
-                //view?.layerContentsRedrawPolicy = .duringViewResize
-
-                window.setOnTop(Bool(mpv.opts.ontop), Int(mpv.opts.ontop_level))
-                window.keepAspect = Bool(mpv.opts.keepaspect_window)
-                window.title = title
-                window.border = Bool(mpv.opts.border)
-
-                titleBar = TitleBar(frame: wr, window: window, common: self)
-
-                let minimized = Bool(mpv.opts.window_minimized)
-                window.isRestorable = false
-                window.setMaximized(minimized ? false : Bool(mpv.opts.window_maximized))
-                window.setMinimized(minimized)
-                window.makeMain()
-                window.makeKey()
-
-                if !minimized {
-                    window.orderFront(nil)
-                }
-
-                NSApp.activate(ignoringOtherApps: true)
+                initView(vo, layer)
+                initWindow(vo)
             }
 
             print(mpv.vout.dwidth)
@@ -125,6 +80,8 @@ class MacCommon: Common {
             window?.title = title
 
 
+
+
             //todo remove
             flagEvents(VO_EVENT_ICC_PROFILE_CHANGED)
 
@@ -145,6 +102,9 @@ class MacCommon: Common {
 
             print(layer.colorspace)
 
+
+
+
             if Bool(mpv.opts.fullscreen) {
                 DispatchQueue.main.async { [weak self] in
                     self?.window?.toggleFullScreen(nil)