cocoa-cb: use EventHelper for event handling

der richter committed 2 years ago

Commit 5ab30601 parent 2a4bf7c3 files · +15 −26Browse files

Unified · Split

3 files

osdep/mac/app_hub.swift +11 −15
osdep/mac/application.m +0 −3
video/out/cocoa_cb_common.swift +4 −8

@@ -20,6 +20,7 @@ class AppHub: NSObject { · 19 unmodified lines
20		20
21	var mpv: OpaquePointer?	21	var mpv: OpaquePointer?
22	@objc var input: InputHelper	22	@objc var input: InputHelper
		23	var event: EventHelper?
23	#if HAVE_MACOS_MEDIA_PLAYER	24	#if HAVE_MACOS_MEDIA_PLAYER
24	var remote: RemoteCommandCenter?	25	var remote: RemoteCommandCenter?
25	#endif	26	#endif
@@ -31,21 +32,16 @@ class AppHub: NSObject { · 5 unmodified lines
31	}	32	}
32		33
33	@objc func initMpv(_ mpv: OpaquePointer) {	34	@objc func initMpv(_ mpv: OpaquePointer) {
34	if isApplication {	35	self.mpv = mpv
35	self.mpv = mpv	36	mpv_observe_property(mpv, 0, "duration", MPV_FORMAT_DOUBLE)
36	mpv_observe_property(mpv, 0, "duration", MPV_FORMAT_DOUBLE)	37	mpv_observe_property(mpv, 0, "time-pos", MPV_FORMAT_DOUBLE)
37	mpv_observe_property(mpv, 0, "time-pos", MPV_FORMAT_DOUBLE)	38	mpv_observe_property(mpv, 0, "speed", MPV_FORMAT_DOUBLE)
38	mpv_observe_property(mpv, 0, "speed", MPV_FORMAT_DOUBLE)	39	mpv_observe_property(mpv, 0, "pause", MPV_FORMAT_FLAG)
39	mpv_observe_property(mpv, 0, "pause", MPV_FORMAT_FLAG)	40	mpv_observe_property(mpv, 0, "media-title", MPV_FORMAT_STRING)
40	mpv_observe_property(mpv, 0, "media-title", MPV_FORMAT_STRING)	41	mpv_observe_property(mpv, 0, "chapter-metadata/title", MPV_FORMAT_STRING)
41	mpv_observe_property(mpv, 0, "chapter-metadata/title", MPV_FORMAT_STRING)	42	mpv_observe_property(mpv, 0, "metadata/by-key/album", MPV_FORMAT_STRING)
42	mpv_observe_property(mpv, 0, "metadata/by-key/album", MPV_FORMAT_STRING)	43	mpv_observe_property(mpv, 0, "metadata/by-key/artist", MPV_FORMAT_STRING)
43	mpv_observe_property(mpv, 0, "metadata/by-key/artist", MPV_FORMAT_STRING)	44	event = EventHelper(mpv)
44	mpv_set_wakeup_callback(mpv, wakeup, TypeHelper.bridge(obj: self))
45	return
46	}
47
48	mpv_destroy(mpv)
49	}	45	}
50		46
51	@objc func initInput(_ input: OpaquePointer?) {	47	@objc func initInput(_ input: OpaquePointer?) {

osdep/mac/application.m+0−3

 #if HAVE_MACOS_TOUCHBAR
     [(TouchBar *)self.touchBar processEvent:event];
 #endif
-    if (_cocoa_cb) {
-        [_cocoa_cb processEvent:event];
-    }
 }
 - (void)initCocoaCb:(struct mpv_handle *)ctx

video/out/cocoa_cb_common.swift+4−8

 import Cocoa
-class CocoaCB: Common {
+class CocoaCB: Common, EventSubscriber {
     var libmpv: LibmpvHelper
     var layer: GLLayer?
         libmpv = LibmpvHelper(mpvHandle, newlog)
         super.init(option, newlog)
         layer = GLLayer(cocoaCB: self)
+        AppHub.shared.event?.subscribe(self, event: .init(name: "MPV_EVENT_SHUTDOWN"))
     }
     func preinit(_ vo: UnsafeMutablePointer<vo>) {
         }
     }
-    @objc func processEvent(_ event: UnsafePointer<mpv_event>) {
+    func handle(event: EventHelper.Event) {
-        switch event.pointee.event_id {
+        if event.name == String(describing: MPV_EVENT_SHUTDOWN) { shutdown() }
-        case MPV_EVENT_SHUTDOWN:
-            shutdown()
-        default:
-            break
-        }
     }
 }

cocoa-cb: use EventHelper for event handling

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code