mac/option: move option functionality from mpv helper to option helper

delete now empty mpv helper

3 files changed, 8 insertions, 8 deletions

diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift
index 9cc7c9f4e5..9225acc8e6 100644
--- a/osdep/mac/input_helper.swift
+++ b/osdep/mac/input_helper.swift
@@ -18,7 +18,7 @@
 import Carbon.HIToolbox
 
 class InputHelper: NSObject {
-    var mpv: MPVHelper?
+    var option: OptionHelper?
     var lock = NSCondition()
     private var input: OpaquePointer?
 
@@ -62,10 +62,10 @@ class InputHelper: NSObject {
         .init(0, 0)
     ]
 
-    @objc init(_ input: OpaquePointer? = nil, _ mpv: MPVHelper? = nil) {
+    @objc init(_ input: OpaquePointer? = nil, _ option: OptionHelper? = nil) {
         super.init()
         self.input = input
-        self.mpv = mpv
+        self.option = option
     }
 
     @objc func put(
@@ -232,11 +232,11 @@ class InputHelper: NSObject {
     @objc func open(files: [String]) {
         lock.withLock {
             guard let input = input else { return }
-            if (mpv?.opts.drag_and_drop ?? -1) == -2 { return }
+            if (option?.opts.drag_and_drop ?? -1) == -2 { return }
 
             var action = NSEvent.modifierFlags.contains(.shift) ? DND_APPEND : DND_REPLACE
-            if (mpv?.opts.drag_and_drop ?? -1) >= 0  {
-                action = mp_dnd_action(UInt32(mpv?.opts.drag_and_drop ?? Int32(DND_REPLACE.rawValue)))
+            if (option?.opts.drag_and_drop ?? -1) >= 0  {
+                action = mp_dnd_action(UInt32(option?.opts.drag_and_drop ?? Int32(DND_REPLACE.rawValue)))
             }
 
             let filesClean = files.map{ $0.hasPrefix("file:///.file/id=") ? (URL(string: $0)?.path ?? $0) : $0 }
diff --git a/osdep/mac/mpv_helper.swift b/osdep/mac/option_helper.swift
index b49e181749..e005b3e38c 100644
--- a/osdep/mac/mpv_helper.swift
+++ b/osdep/mac/option_helper.swift
@@ -19,7 +19,7 @@ import Cocoa
 
 typealias swift_wakeup_cb_fn = (@convention(c) (UnsafeMutableRawPointer?) -> Void)?
 
-class MPVHelper: NSObject {
+class OptionHelper: NSObject {
     var log: LogHelper
     var vo: UnsafeMutablePointer<vo>
     var optsCachePtr: UnsafeMutablePointer<m_config_cache>
diff --git a/osdep/mac/precise_timer.swift b/osdep/mac/precise_timer.swift
index 4dbfec2694..586925f1f9 100644
--- a/osdep/mac/precise_timer.swift
+++ b/osdep/mac/precise_timer.swift
@@ -24,7 +24,7 @@ struct Timing {
 
 class PreciseTimer {
     unowned var common: Common
-    var mpv: MPVHelper? { get { return common.mpv } }
+    var option: OptionHelper? { get { return common.option } }
 
     let nanoPerSecond: Double = 1e+9
     let machToNano: Double = {