mac/option: remove unused and obsolete variables

der richter committed 2 years ago

Commit 2d9be041 parent dc5059d3 files · +3 −8Browse files

Unified · Split

3 files

 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>
     // 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

@@ -39,7 +39,7 @@ class CocoaCB: Common { · 38 unmodified lines
39	}	39	}
40		40
41	func preinit(_ vo: UnsafeMutablePointer<vo>) {	41	func preinit(_ vo: UnsafeMutablePointer<vo>) {
42	option = OptionHelper(vo, log)	42	option = OptionHelper(vo)
43	input = InputHelper(vo.pointee.input_ctx, option)	43	input = InputHelper(vo.pointee.input_ctx, option)
44		44
45	if backendState == .uninitialized {	45	if backendState == .uninitialized {

@@ -27,7 +27,7 @@ class MacCommon: Common { · 26 unmodified lines
27	@objc init(_ vo: UnsafeMutablePointer<vo>) {	27	@objc init(_ vo: UnsafeMutablePointer<vo>) {
28	let newlog = mp_log_new(vo, vo.pointee.log, "mac")	28	let newlog = mp_log_new(vo, vo.pointee.log, "mac")
29	super.init(newlog)	29	super.init(newlog)
30	option = OptionHelper(vo, log)	30	option = OptionHelper(vo)
31	input = InputHelper(vo.pointee.input_ctx, option)	31	input = InputHelper(vo.pointee.input_ctx, option)
32	timer = PreciseTimer(common: self)	32	timer = PreciseTimer(common: self)
33		33

Keyboard shortcuts