RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-19 09:57:34 +00:00
Code Issues Releases Wiki Activity

mac/helper: make wakeup callback declaration consistent

Browse Source
This commit is contained in:
der richter 2024-04-27 22:35:36 +02:00
parent 6df06e5dc5
commit 984c890661
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osdep/mac/event_helper.swift
View File

@ -27,7 +27,7 @@ extension EventSubscriber {
} }
extension EventHelper { extension EventHelper {
typealias wakeup_cb = (@convention(c) (UnsafeMutableRawPointer?) -> Void)? typealias WakeupCallback = (@convention(c) (UnsafeMutableRawPointer?) -> Void)?
struct Event { struct Event {
var id: String { var id: String {
@ -91,7 +91,7 @@ class EventHelper {
} }
} }
let wakeup: wakeup_cb = { ( ctx ) in let wakeup: WakeupCallback = { ( ctx ) in
let event = unsafeBitCast(ctx, to: EventHelper.self) let event = unsafeBitCast(ctx, to: EventHelper.self)
DispatchQueue.main.async { event.eventLoop() } DispatchQueue.main.async { event.eventLoop() }
} }

6
osdep/mac/option_helper.swift
View File

@ -17,7 +17,9 @@
import Cocoa import Cocoa
typealias swift_wakeup_cb_fn = (@convention(c) (UnsafeMutableRawPointer?) -> Void)? extension OptionHelper {
typealias WakeupCallback = (@convention(c) (UnsafeMutableRawPointer?) -> Void)?
}
class OptionHelper { class OptionHelper {
var voCachePtr: UnsafeMutablePointer<m_config_cache> var voCachePtr: UnsafeMutablePointer<m_config_cache>
@ -64,7 +66,7 @@ class OptionHelper {
} }
} }
func setMacOptionCallback(_ callback: swift_wakeup_cb_fn, context object: AnyObject) { func setMacOptionCallback(_ callback: WakeupCallback, context object: AnyObject) {
m_config_cache_set_wakeup_cb(macCachePtr, callback, TypeHelper.bridge(obj: object)) m_config_cache_set_wakeup_cb(macCachePtr, callback, TypeHelper.bridge(obj: object))
} }

2
video/out/mac/common.swift
View File

@ -654,7 +654,7 @@ class Common: NSObject {
} }
} }
let macOptsWakeupCallback: swift_wakeup_cb_fn = { ( ctx ) in let macOptsWakeupCallback: OptionHelper.WakeupCallback = { ( ctx ) in
let com = unsafeBitCast(ctx, to: Common.self) let com = unsafeBitCast(ctx, to: Common.self)
DispatchQueue.main.async { DispatchQueue.main.async {
com.macOptsUpdate() com.macOptsUpdate()