diff options
author | der richter <der.richter@gmx.de> | 2025-02-11 23:21:32 +0100 |
---|---|---|
committer | der richter <der.richter@gmx.de> | 2025-02-15 16:22:52 +0000 |
commit | c2106d1894913d236d5090bf653c81b62b2d3668 (patch) | |
tree | edce552f4f97ec16c6f43dd4ff1e4fb95830e4c4 | |
parent | 21732787b8fc9389058000f8b0e10097135f1f08 (diff) | |
download | mpv-c2106d1894913d236d5090bf653c81b62b2d3668.tar.bz2 mpv-c2106d1894913d236d5090bf653c81b62b2d3668.tar.xz |
mac/option: add MPOpts root options
-rw-r--r-- | osdep/mac/app_bridge.m | 5 | ||||
-rw-r--r-- | osdep/mac/app_bridge_objc.h | 1 | ||||
-rw-r--r-- | osdep/mac/app_hub.swift | 4 | ||||
-rw-r--r-- | osdep/mac/option_helper.swift | 6 |
4 files changed, 16 insertions, 0 deletions
diff --git a/osdep/mac/app_bridge.m b/osdep/mac/app_bridge.m index 8f256034e1..58e10cb405 100644 --- a/osdep/mac/app_bridge.m +++ b/osdep/mac/app_bridge.m @@ -130,6 +130,11 @@ const struct m_sub_options *app_bridge_vo_conf(void) return &vo_sub_opts; } +const struct m_sub_options *app_bridge_root_conf(void) +{ + return &mp_opt_root; +} + #if HAVE_SWIFT void cocoa_init_media_keys(void) { diff --git a/osdep/mac/app_bridge_objc.h b/osdep/mac/app_bridge_objc.h index 0330af0b73..09ff845471 100644 --- a/osdep/mac/app_bridge_objc.h +++ b/osdep/mac/app_bridge_objc.h @@ -56,3 +56,4 @@ NSData *app_bridge_icon(void); void app_bridge_tarray_append(void *t, char ***a, int *i, char *s); const struct m_sub_options *app_bridge_mac_conf(void); const struct m_sub_options *app_bridge_vo_conf(void); +const struct m_sub_options *app_bridge_root_conf(void); diff --git a/osdep/mac/app_hub.swift b/osdep/mac/app_hub.swift index 4e8ceef175..e83f5447bb 100644 --- a/osdep/mac/app_hub.swift +++ b/osdep/mac/app_hub.swift @@ -134,4 +134,8 @@ class AppHub: NSObject { func getVoConf() -> UnsafePointer<m_sub_options>? { return app_bridge_vo_conf() } + + func getRootConf() -> UnsafePointer<m_sub_options>? { + return app_bridge_root_conf() + } } diff --git a/osdep/mac/option_helper.swift b/osdep/mac/option_helper.swift index 39c33f4f86..162062d806 100644 --- a/osdep/mac/option_helper.swift +++ b/osdep/mac/option_helper.swift @@ -24,6 +24,7 @@ extension OptionHelper { class OptionHelper { var voCachePtr: UnsafeMutablePointer<m_config_cache> var macCachePtr: UnsafeMutablePointer<m_config_cache> + var rootRawPtr: UnsafeMutableRawPointer var voPtr: UnsafeMutablePointer<mp_vo_opts> { return UnsafeMutablePointer<mp_vo_opts>(OpaquePointer(voCachePtr.pointee.opts)) @@ -31,16 +32,21 @@ class OptionHelper { var macPtr: UnsafeMutablePointer<macos_opts> { return UnsafeMutablePointer<macos_opts>(OpaquePointer(macCachePtr.pointee.opts)) } + var rootPtr: UnsafeMutablePointer<MPOpts> { + return UnsafeMutablePointer<MPOpts>(OpaquePointer(rootRawPtr)) + } // these computed properties return a local copy of the struct accessed: // - don't use if you rely on the pointers // - only for reading var vo: mp_vo_opts { return voPtr.pointee } var mac: macos_opts { return macPtr.pointee } + var root: MPOpts { return rootPtr.pointee } init(_ taParent: UnsafeMutableRawPointer, _ global: UnsafeMutablePointer<mpv_global>?) { voCachePtr = m_config_cache_alloc(taParent, global, AppHub.shared.getVoConf()) macCachePtr = m_config_cache_alloc(taParent, global, AppHub.shared.getMacConf()) + rootRawPtr = mp_get_config_group(taParent, global, AppHub.shared.getRootConf()) } func nextChangedOption(property: inout UnsafeMutableRawPointer?) -> Bool { |