summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2024-03-19 21:36:07 +0100
committerder richter <der.richter@gmx.de>2024-03-21 18:33:15 +0100
commit6defd49aa1f1d7b8a4d536c2a9fbf856dcf541db (patch)
treec00c8a69e190c1cd6026e5a900d13bc1a9c4e854 /osdep
parent90c534a8213a84c78f54d093c429d65b0c80a811 (diff)
downloadmpv-6defd49aa1f1d7b8a4d536c2a9fbf856dcf541db.tar.bz2
mpv-6defd49aa1f1d7b8a4d536c2a9fbf856dcf541db.tar.xz
mac/option: make option helper vo struct independent
Diffstat (limited to 'osdep')
-rw-r--r--osdep/mac/option_helper.swift9
1 files changed, 3 insertions, 6 deletions
diff --git a/osdep/mac/option_helper.swift b/osdep/mac/option_helper.swift
index 996ec3db45..943651967d 100644
--- a/osdep/mac/option_helper.swift
+++ b/osdep/mac/option_helper.swift
@@ -20,7 +20,6 @@ import Cocoa
typealias swift_wakeup_cb_fn = (@convention(c) (UnsafeMutableRawPointer?) -> Void)?
class OptionHelper: NSObject {
- var vo: UnsafeMutablePointer<vo>
var optsCachePtr: UnsafeMutablePointer<m_config_cache>
var macOptsCachePtr: UnsafeMutablePointer<m_config_cache>
@@ -35,11 +34,9 @@ class OptionHelper: NSObject {
var opts: mp_vo_opts { get { return optsPtr.pointee } }
var macOpts: macos_opts { get { return macOptsPtr.pointee } }
- init(_ vo: UnsafeMutablePointer<vo>) {
- self.vo = vo
-
- 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
+ init(_ taParent: UnsafeMutableRawPointer, _ global: OpaquePointer?) {
+ guard let cache = m_config_cache_alloc(taParent, global, Application.getVoSubConf()),
+ let macCache = m_config_cache_alloc(taParent, global, Application.getMacOSConf()) else
{
// will never be hit, mp_get_config_group asserts for invalid groups
exit(1)