diff options
author | der richter <der.richter@gmx.de> | 2024-03-26 21:50:35 +0100 |
---|---|---|
committer | der richter <der.richter@gmx.de> | 2024-03-29 14:20:40 +0100 |
commit | e71e340b77c65b71510a74b69d262ca9e3ee8032 (patch) | |
tree | 28fe0e0009abeaed5874366f1c4690ff9f2d4d3d /osdep/mac | |
parent | 6debb22a0cde5231ebed6df5013d426991f87a27 (diff) | |
download | mpv-e71e340b77c65b71510a74b69d262ca9e3ee8032.tar.bz2 mpv-e71e340b77c65b71510a74b69d262ca9e3ee8032.tar.xz |
mac: remove now unnecessary objective-c forwarding
Diffstat (limited to 'osdep/mac')
-rw-r--r-- | osdep/mac/event_helper.swift | 5 | ||||
-rw-r--r-- | osdep/mac/input_helper.swift | 6 | ||||
-rw-r--r-- | osdep/mac/log_helper.swift | 2 | ||||
-rw-r--r-- | osdep/mac/option_helper.swift | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/osdep/mac/event_helper.swift b/osdep/mac/event_helper.swift index 003f04e766..fa2cd8e01e 100644 --- a/osdep/mac/event_helper.swift +++ b/osdep/mac/event_helper.swift @@ -57,12 +57,12 @@ extension EventHelper { } } -public class EventHelper: NSObject { +class EventHelper { unowned let appHub: AppHub var mpv: OpaquePointer? var events: [String:[Int:EventSubscriber]] = [:] - @objc init?(_ appHub: AppHub, _ mpvHandle: OpaquePointer) { + init?(_ appHub: AppHub, _ mpvHandle: OpaquePointer) { if !appHub.isApplication { mpv_destroy(mpvHandle) return nil @@ -70,7 +70,6 @@ public class EventHelper: NSObject { self.appHub = appHub self.mpv = mpvHandle - super.init() mpv_set_wakeup_callback(mpvHandle, wakeup, TypeHelper.bridge(obj: self)) } diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift index 70099ce3ae..d53bfe779b 100644 --- a/osdep/mac/input_helper.swift +++ b/osdep/mac/input_helper.swift @@ -62,13 +62,13 @@ class InputHelper: NSObject { .init(0, 0) ] - @objc init(_ input: OpaquePointer? = nil, _ option: OptionHelper? = nil) { + init(_ input: OpaquePointer? = nil, _ option: OptionHelper? = nil) { super.init() self.input = input self.option = option } - @objc func put( + func put( key: Int32, modifiers: NSEvent.ModifierFlags = .init(rawValue: 0), type: NSEvent.EventType = .applicationDefined @@ -258,7 +258,7 @@ class InputHelper: NSObject { } } - @objc func signal(input: OpaquePointer? = nil) { + func signal(input: OpaquePointer? = nil) { lock.withLock { self.input = input if input != nil { lock.signal() } diff --git a/osdep/mac/log_helper.swift b/osdep/mac/log_helper.swift index 94640756bd..3fdb875491 100644 --- a/osdep/mac/log_helper.swift +++ b/osdep/mac/log_helper.swift @@ -17,7 +17,7 @@ import Cocoa -class LogHelper: NSObject { +class LogHelper { var log: OpaquePointer? init(_ log: OpaquePointer?) { diff --git a/osdep/mac/option_helper.swift b/osdep/mac/option_helper.swift index 8610c4ec46..c44f0907c8 100644 --- a/osdep/mac/option_helper.swift +++ b/osdep/mac/option_helper.swift @@ -19,7 +19,7 @@ import Cocoa typealias swift_wakeup_cb_fn = (@convention(c) (UnsafeMutableRawPointer?) -> Void)? -class OptionHelper: NSObject { +class OptionHelper { var voCachePtr: UnsafeMutablePointer<m_config_cache> var macCachePtr: UnsafeMutablePointer<m_config_cache> |