diff options
Diffstat (limited to 'video/out/cocoa-cb')
| -rw-r--r-- | video/out/cocoa-cb/events_view.swift | 12 | ||||
| -rw-r--r-- | video/out/cocoa-cb/window.swift | 2 |
2 files changed, 7 insertions, 7 deletions
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 } |