mac: fix libmpv usage without embedding

osdep/macos/libmpv_helper.swift

@@ -34,10 +34,8 @@ class LibmpvHelper {
         mpvHandle = mpv
         log = LogHelper(mpLog)
 
-        guard let app = NSApp as? Application,
-              let ptr = mp_get_config_group(nil,
-                                            mp_client_get_global(mpvHandle),
-                                            app.getMacOSConf()) else
+        let global = mp_client_get_global(mpvHandle)
+        guard let ptr = mp_get_config_group(nil, global, Application.getMacOSConf()) else
         {
             log.sendError("macOS config group couldn't be retrieved'")
             exit(1)

osdep/macos/mpv_helper.swift

@@ -42,23 +42,14 @@ class MPVHelper {
         self.vo = vo
         self.log = log
 
-        guard let app = NSApp as? Application,
-              let cache = m_config_cache_alloc(vo, vo.pointee.global, app.getVoSubConf()) else
+        guard let cache = m_config_cache_alloc(vo, vo.pointee.global, Application.getVoSubConf()),
+              let macCache = m_config_cache_alloc(vo, vo.pointee.global, Application.getMacOSConf()) else
         {
-            log.sendError("NSApp couldn't be retrieved")
+            // will never be hit, mp_get_config_group asserts for invalid groups
             exit(1)
         }
-
         optsCachePtr = cache
         optsPtr = UnsafeMutablePointer<mp_vo_opts>(OpaquePointer(cache.pointee.opts))
-
-        guard let macCache = m_config_cache_alloc(vo,
-                                                  vo.pointee.global,
-                                                  app.getMacOSConf()) else
-        {
-            // will never be hit, mp_get_config_group asserts for invalid groups
-            exit(1)
-        }
         macOptsCachePtr = macCache
         macOptsPtr = UnsafeMutablePointer<macos_opts>(OpaquePointer(macCache.pointee.opts))
     }

osdep/macosx_application.h

@@ -33,7 +33,6 @@ enum {
 };
 
 struct macos_opts {
-    int macos_title_bar_style;
     int macos_title_bar_appearance;
     int macos_title_bar_material;
     struct m_color macos_title_bar_color;

osdep/macosx_application.m

@@ -190,12 +190,12 @@ - (void)setMpvHandle:(struct mpv_handle *)ctx
 #endif
 }
 
-- (const struct m_sub_options *)getMacOSConf
++ (const struct m_sub_options *)getMacOSConf
 {
     return &macos_conf;
 }
 
-- (const struct m_sub_options *)getVoSubConf
++ (const struct m_sub_options *)getVoSubConf
 {
     return &vo_sub_opts;
 }

osdep/macosx_application_objc.h

@@ -31,8 +31,8 @@ struct mpv_handle;
 - (void)stopMPV:(char *)cmd;
 - (void)openFiles:(NSArray *)filenames;
 - (void)setMpvHandle:(struct mpv_handle *)ctx;
-- (const struct m_sub_options *)getMacOSConf;
-- (const struct m_sub_options *)getVoSubConf;
++ (const struct m_sub_options *)getMacOSConf;
++ (const struct m_sub_options *)getVoSubConf;
 
 @property(nonatomic, retain) MenuBar *menuBar;
 @property(nonatomic, assign) size_t openCount;

video/out/mac/title_bar.swift

@@ -195,10 +195,6 @@ class TitleBar: NSVisualEffectView {
         default:
             return nil
         }
-
-
-        let style = UserDefaults.standard.string(forKey: "AppleInterfaceStyle")
-        return appearanceFrom(string: style == nil ? "aqua" : "vibrantDark")
     }
 
     func materialFrom(string: String) -> NSVisualEffectView.Material {
@@ -221,9 +217,7 @@ class TitleBar: NSVisualEffectView {
         case "15", "light":                 return .light
         case "16", "mediumLight":           return .mediumLight
         case "17", "ultraDark":             return .ultraDark
-        default:                            break
+        default:                            return .titlebar
         }
-
-        return .titlebar
     }
 }