From a32db637b5c66c0304147caadf02d7b28083bcee Mon Sep 17 00:00:00 2001 From: der richter Date: Sat, 30 Nov 2019 16:08:32 +0100 Subject: mac: replace old event tap for media key support with MediaPlayer the old event tap has several problems, like no proper priority support or having to set accessibility permissions for mpv or the terminal. it is now replaced by the new MediaPlayer which has proper priority support and isn't as greedy as previously. this only includes Media Key support and not any of the other features included in the MediaPlayer framework, like proper Now Playing data (only set dummy data for now). this is only available on macOS 10.12.2 and higher. also removes some unnecessary redefines. Fixes #6389 --- video/out/cocoa-cb/events_view.swift | 12 ++++++------ video/out/cocoa-cb/window.swift | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'video/out') diff --git a/video/out/cocoa-cb/events_view.swift b/video/out/cocoa-cb/events_view.swift index 31533bbb98..73ccba527f 100644 --- a/video/out/cocoa-cb/events_view.swift +++ b/video/out/cocoa-cb/events_view.swift @@ -180,20 +180,20 @@ class EventsView: NSView { } func signalMouseDown(_ event: NSEvent) { - signalMouseEvent(event, SWIFT_KEY_STATE_DOWN) + signalMouseEvent(event, MP_KEY_STATE_DOWN) if event.clickCount > 1 { - signalMouseEvent(event, SWIFT_KEY_STATE_UP) + signalMouseEvent(event, MP_KEY_STATE_UP) } } func signalMouseUp(_ event: NSEvent) { - signalMouseEvent(event, SWIFT_KEY_STATE_UP) + signalMouseEvent(event, MP_KEY_STATE_UP) } - func signalMouseEvent(_ event: NSEvent, _ state: Int32) { - hasMouseDown = state == SWIFT_KEY_STATE_DOWN + func signalMouseEvent(_ event: NSEvent, _ state: UInt32) { + hasMouseDown = state == MP_KEY_STATE_DOWN let mpkey = getMpvButton(event) - cocoa_put_key_with_modifiers((mpkey | state), Int32(event.modifierFlags.rawValue)); + cocoa_put_key_with_modifiers((mpkey | Int32(state)), Int32(event.modifierFlags.rawValue)); } func signalMouseMovement(_ event: NSEvent) { diff --git a/video/out/cocoa-cb/window.swift b/video/out/cocoa-cb/window.swift index 94f80e59b4..6e53ef309c 100644 --- a/video/out/cocoa-cb/window.swift +++ b/video/out/cocoa-cb/window.swift @@ -486,7 +486,7 @@ class Window: NSWindow, NSWindowDelegate { } func windowShouldClose(_ sender: NSWindow) -> Bool { - cocoa_put_key(SWIFT_KEY_CLOSE_WIN) + cocoa_put_key(MP_KEY_CLOSE_WIN) return false } -- cgit v1.2.3