mirror of https://github.com/mpv-player/mpv
cocoa-cb: remove unnecessary semicolons
This commit is contained in:
parent
b8f2811f8d
commit
8e1ceaba34
|
@ -200,7 +200,7 @@ class EventsView: NSView {
|
|||
func signalMouseEvent(_ event: NSEvent, _ state: UInt32) {
|
||||
hasMouseDown = state == MP_KEY_STATE_DOWN
|
||||
let mpkey = getMpvButton(event)
|
||||
cocoa_put_key_with_modifiers((mpkey | Int32(state)), Int32(event.modifierFlags.rawValue));
|
||||
cocoa_put_key_with_modifiers((mpkey | Int32(state)), Int32(event.modifierFlags.rawValue))
|
||||
}
|
||||
|
||||
func signalMouseMovement(_ event: NSEvent) {
|
||||
|
@ -219,11 +219,11 @@ class EventsView: NSView {
|
|||
var cmd: Int32
|
||||
|
||||
if abs(event.deltaY) >= abs(event.deltaX) {
|
||||
delta = Double(event.deltaY) * 0.1;
|
||||
cmd = delta > 0 ? SWIFT_WHEEL_UP : SWIFT_WHEEL_DOWN;
|
||||
delta = Double(event.deltaY) * 0.1
|
||||
cmd = delta > 0 ? SWIFT_WHEEL_UP : SWIFT_WHEEL_DOWN
|
||||
} else {
|
||||
delta = Double(event.deltaX) * 0.1;
|
||||
cmd = delta > 0 ? SWIFT_WHEEL_RIGHT : SWIFT_WHEEL_LEFT;
|
||||
delta = Double(event.deltaX) * 0.1
|
||||
cmd = delta > 0 ? SWIFT_WHEEL_RIGHT : SWIFT_WHEEL_LEFT
|
||||
}
|
||||
|
||||
mpv?.putAxis(cmd, delta: abs(delta))
|
||||
|
@ -243,9 +243,9 @@ class EventsView: NSView {
|
|||
var mpkey: Int32
|
||||
|
||||
if abs(deltaY) >= abs(deltaX) {
|
||||
mpkey = deltaY > 0 ? SWIFT_WHEEL_UP : SWIFT_WHEEL_DOWN;
|
||||
mpkey = deltaY > 0 ? SWIFT_WHEEL_UP : SWIFT_WHEEL_DOWN
|
||||
} else {
|
||||
mpkey = deltaX > 0 ? SWIFT_WHEEL_RIGHT : SWIFT_WHEEL_LEFT;
|
||||
mpkey = deltaX > 0 ? SWIFT_WHEEL_RIGHT : SWIFT_WHEEL_LEFT
|
||||
}
|
||||
|
||||
cocoa_put_key_with_modifiers(mpkey, Int32(modifiers.rawValue))
|
||||
|
@ -285,12 +285,12 @@ class EventsView: NSView {
|
|||
func getMpvButton(_ event: NSEvent) -> Int32 {
|
||||
let buttonNumber = event.buttonNumber
|
||||
switch (buttonNumber) {
|
||||
case 0: return SWIFT_MBTN_LEFT;
|
||||
case 1: return SWIFT_MBTN_RIGHT;
|
||||
case 2: return SWIFT_MBTN_MID;
|
||||
case 3: return SWIFT_MBTN_BACK;
|
||||
case 4: return SWIFT_MBTN_FORWARD;
|
||||
default: return SWIFT_MBTN9 + Int32(buttonNumber - 5);
|
||||
case 0: return SWIFT_MBTN_LEFT
|
||||
case 1: return SWIFT_MBTN_RIGHT
|
||||
case 2: return SWIFT_MBTN_MID
|
||||
case 3: return SWIFT_MBTN_BACK
|
||||
case 4: return SWIFT_MBTN_FORWARD
|
||||
default: return SWIFT_MBTN9 + Int32(buttonNumber - 5)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -337,7 +337,7 @@ class Window: NSWindow, NSWindowDelegate {
|
|||
}
|
||||
|
||||
func aspectFit(rect r: NSRect, in rTarget: NSRect) -> NSRect {
|
||||
var s = rTarget.width / r.width;
|
||||
var s = rTarget.width / r.width
|
||||
if r.height*s > rTarget.height {
|
||||
s = rTarget.height / r.height
|
||||
}
|
||||
|
|
|
@ -355,7 +355,7 @@ class CocoaCB: NSObject {
|
|||
let displayID = ccb.window?.screen?.displayID ?? display
|
||||
|
||||
if displayID == display {
|
||||
ccb.libmpv.sendVerbose("Detected display mode change, updating screen refresh rate");
|
||||
ccb.libmpv.sendVerbose("Detected display mode change, updating screen refresh rate")
|
||||
ccb.flagEvents(VO_EVENT_WIN_STATE)
|
||||
}
|
||||
}
|
||||
|
@ -490,7 +490,7 @@ class CocoaCB: NSObject {
|
|||
ccb.getTargetScreen(forFullscreen: false)?.backingScaleFactor ??
|
||||
NSScreen.main?.backingScaleFactor ?? 1.0
|
||||
scaleFactor.pointee = Double(factor)
|
||||
return VO_TRUE;
|
||||
return VO_TRUE
|
||||
}
|
||||
return VO_FALSE
|
||||
case VOCTRL_RESTORE_SCREENSAVER:
|
||||
|
|
Loading…
Reference in New Issue