From 2d9be04c005ec616872d20d3de288f5c53bdb3bf Mon Sep 17 00:00:00 2001
From: der richter <der.richter@gmx.de>
Date: Tue, 19 Mar 2024 19:53:07 +0100
Subject: [PATCH] mac/option: remove unused and obsolete variables

---
 osdep/mac/option_helper.swift   | 7 +------
 video/out/cocoa_cb_common.swift | 2 +-
 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)