log cleanup

Author: Akemi

video/out/mac_common.swift

@@ -22,8 +22,9 @@ class MacCommon: Common {
 
     // functions called by context
     @objc init(_ vo: UnsafeMutablePointer<vo>) {
-        super.init()
-        mpv = MPVHelper(vo, "mac")
+        let newlog = mp_log_new(vo, vo.pointee.log, "mac")
+        super.init(newlog)
+        mpv = MPVHelper(vo, log)
 
         DispatchQueue.main.sync {
             layer = CAMetalLayer()
@@ -49,15 +50,15 @@ class MacCommon: Common {
 
             guard let mpv = mpv else {
                 // TODO log helper refactor
-                //mpv?.sendWarning("Unexpected nil value in Control Callback")
+                //log.sendWarning("Unexpected nil value in Control Callback")
                 exit(1)
             }
             guard let layer = self.layer else {
-                mpv.sendError("Something went wrong, no Video was initialized")
+                log.sendError("Something went wrong, no Video was initialized")
                 exit(1)
             }
             guard let targetScreen = getScreenBy(id: Int(mpv.opts.screen_id)) ?? NSScreen.main else {
-                mpv.sendError("Something went wrong, no Screen was found")
+                log.sendError("Something went wrong, no Screen was found")
                 exit(1)
             }
 
@@ -68,13 +69,13 @@ class MacCommon: Common {
             if window == nil {
                 view = EventsView(frame: wr, common: self)
                 guard let view = self.view else {
-                    mpv.sendError("Something went wrong, no View was initialized")
+                    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 {
-                    mpv.sendError("Something went wrong, no Window was initialized")
+                    log.sendError("Something went wrong, no Window was initialized")
                     exit(1)
                 }
 
@@ -83,7 +84,9 @@ class MacCommon: Common {
                 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)
@@ -127,7 +130,7 @@ class MacCommon: Common {
 
             //TODO ICC
             guard let colorSpace = window?.screen?.colorSpace else {
-                mpv.sendWarning("Couldn't update ICC Profile, no color space available")
+                log.sendWarning("Couldn't update ICC Profile, no color space available")
                 return
             }
 
@@ -218,7 +221,7 @@ class MacCommon: Common {
         guard let opts: mp_vo_opts = mpv.opts,
               let targetScreen = getScreenBy(id: Int(opts.screen_id)) ?? NSScreen.main else
         {
-            mpv.sendWarning("Couldn't update Window size, no Screen available")
+            log.sendWarning("Couldn't update Window size, no Screen available")
             return
         }
 
@@ -312,7 +315,7 @@ class MacCommon: Common {
 
     func updateICCProfile() {
         guard let colorSpace = window?.screen?.colorSpace else {
-            mpv.sendWarning("Couldn't update ICC Profile, no color space available")
+            log.sendWarning("Couldn't update ICC Profile, no color space available")
             return
         }