diff options
| author | der richter <der.richter@gmx.de> | 2024-03-19 19:53:07 +0100 |
|---|---|---|
| committer | der richter <der.richter@gmx.de> | 2024-03-21 18:33:15 +0100 |
| commit | 2d9be04c005ec616872d20d3de288f5c53bdb3bf (patch) | |
| tree | d8dcedd0c36c07a9a8dbe1d3f154cd74eff9f94a | |
| parent | dc5059d0279a1d809022760b67b4a9d64854d294 (diff) | |
| download | mpv-2d9be04c005ec616872d20d3de288f5c53bdb3bf.tar.bz2 mpv-2d9be04c005ec616872d20d3de288f5c53bdb3bf.tar.xz | |
mac/option: remove unused and obsolete variables
| -rw-r--r-- | osdep/mac/option_helper.swift | 7 | ||||
| -rw-r--r-- | video/out/cocoa_cb_common.swift | 2 | ||||
| -rw-r--r-- | video/out/mac_common.swift | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/osdep/mac/option_helper.swift b/osdep/mac/option_helper.swift index e005b3e38c..c6612d0218 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 log: LogHelper var vo: UnsafeMutablePointer<vo> var optsCachePtr: UnsafeMutablePointer<m_config_cache> var optsPtr: UnsafeMutablePointer<mp_vo_opts> @@ -30,15 +29,11 @@ class OptionHelper: NSObject { // these computed properties return a local copy of the struct accessed: // - don't use if you rely on the pointers // - only for reading - var vout: vo { get { return vo.pointee } } - var optsCache: m_config_cache { get { return optsCachePtr.pointee } } var opts: mp_vo_opts { get { return optsPtr.pointee } } - var macOptsCache: m_config_cache { get { return macOptsCachePtr.pointee } } var macOpts: macos_opts { get { return macOptsPtr.pointee } } - init(_ vo: UnsafeMutablePointer<vo>, _ log: LogHelper) { + init(_ vo: UnsafeMutablePointer<vo>) { self.vo = vo - self.log = log 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 diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift index d92b5efbcb..624f2bec4b 100644 --- a/video/out/cocoa_cb_common.swift +++ b/video/out/cocoa_cb_common.swift @@ -39,7 +39,7 @@ class CocoaCB: Common { } func preinit(_ vo: UnsafeMutablePointer<vo>) { - option = OptionHelper(vo, log) + option = OptionHelper(vo) input = InputHelper(vo.pointee.input_ctx, option) if backendState == .uninitialized { diff --git a/video/out/mac_common.swift b/video/out/mac_common.swift index c319b5b910..41bed0c4f4 100644 --- a/video/out/mac_common.swift +++ b/video/out/mac_common.swift @@ -27,7 +27,7 @@ class MacCommon: Common { @objc init(_ vo: UnsafeMutablePointer<vo>) { let newlog = mp_log_new(vo, vo.pointee.log, "mac") super.init(newlog) - option = OptionHelper(vo, log) + option = OptionHelper(vo) input = InputHelper(vo.pointee.input_ctx, option) timer = PreciseTimer(common: self) |