diff options
Diffstat (limited to 'osdep/mac/event_helper.swift')
-rw-r--r-- | osdep/mac/event_helper.swift | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/osdep/mac/event_helper.swift b/osdep/mac/event_helper.swift index 277a9aa08d..0f194ce8aa 100644 --- a/osdep/mac/event_helper.swift +++ b/osdep/mac/event_helper.swift @@ -23,18 +23,18 @@ protocol EventSubscriber: AnyObject { } extension EventSubscriber { - var uid: Int { get { return Int(bitPattern: ObjectIdentifier(self)) }} + var uid: Int { return Int(bitPattern: ObjectIdentifier(self)) } } extension EventHelper { - typealias wakeup_cb = (@convention(c) (UnsafeMutableRawPointer?) -> Void)? + typealias WakeupCallback = (@convention(c) (UnsafeMutableRawPointer?) -> Void)? struct Event { var id: String { - get { name + (name.starts(with: "MPV_EVENT_") ? "" : String(format.rawValue)) } + return name + (name.starts(with: "MPV_EVENT_") ? "" : String(format.rawValue)) } var idReset: String { - get { name + (name.starts(with: "MPV_EVENT_") ? "" : String(MPV_FORMAT_NONE.rawValue)) } + return name + (name.starts(with: "MPV_EVENT_") ? "" : String(MPV_FORMAT_NONE.rawValue)) } let name: String let format: mpv_format @@ -62,7 +62,7 @@ extension EventHelper { class EventHelper { unowned let appHub: AppHub var mpv: OpaquePointer? - var events: [String:[Int:EventSubscriber]] = [:] + var events: [String: [Int: EventSubscriber]] = [:] init?(_ appHub: AppHub, _ mpv: OpaquePointer) { if !appHub.isApplication { @@ -91,7 +91,7 @@ class EventHelper { } } - let wakeup: wakeup_cb = { ( ctx ) in + let wakeup: WakeupCallback = { ( ctx ) in let event = unsafeBitCast(ctx, to: EventHelper.self) DispatchQueue.main.async { event.eventLoop() } } @@ -128,7 +128,7 @@ class EventHelper { let name = String(cString: property.name) let format = property.format for (_, subscriber) in events[name + String(format.rawValue)] ?? [:] { - var event: Event? = nil + var event: Event? switch format { case MPV_FORMAT_STRING: event = .init(name: name, format: format, string: TypeHelper.toString(property.data)) |