Commit f95c2c87 authored by David Fuhrmann's avatar David Fuhrmann

macosx: handle space key by core, used as default setting for play / pause

parent 15bc6f28
......@@ -157,11 +157,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_mi_quit setKeyEquivalentModifierMask: [o_vlcstringutility VLCModifiersToCocoa:o_key]];
FREENULL(key);
key = config_GetPsz(p_intf, "key-play-pause");
o_key = [NSString stringWithFormat:@"%s", key];
[o_mi_play setKeyEquivalent: [o_vlcstringutility VLCKeyToString: o_key]];
[o_mi_play setKeyEquivalentModifierMask: [o_vlcstringutility VLCModifiersToCocoa:o_key]];
FREENULL(key);
// do not assign play/pause key
key = config_GetPsz(p_intf, "key-stop");
o_key = [NSString stringWithFormat:@"%s", key];
......
......@@ -133,12 +133,8 @@
else if (key == 'f' && i_pressed_modifiers & NSControlKeyMask && i_pressed_modifiers & NSCommandKeyMask)
[[VLCCoreInteraction sharedInstance] toggleFullscreen];
else if (p_vout) {
if (key == ' ')
[[VLCCoreInteraction sharedInstance] playOrPause];
else {
val.i_int |= (int)CocoaKeyToVLC(key);
var_Set(p_vout->p_libvlc, "key-pressed", val);
}
val.i_int |= (int)CocoaKeyToVLC(key);
var_Set(p_vout->p_libvlc, "key-pressed", val);
}
else
msg_Dbg(VLCIntf, "could not send keyevent to VLC core");
......
......@@ -1202,11 +1202,6 @@ static VLCMain *_o_sharedMainInstance = nil;
}
}
if (key == 0x0020) { // space key
[[VLCCoreInteraction sharedInstance] playOrPause];
return YES;
}
val.i_int |= CocoaKeyToVLC(key);
BOOL b_found_key = NO;
......
......@@ -2146,7 +2146,7 @@ vlc_module_begin ()
*/
# define KEY_TOGGLE_FULLSCREEN "Command+f"
# define KEY_LEAVE_FULLSCREEN "Esc"
# define KEY_PLAY_PAUSE "Command+p"
# define KEY_PLAY_PAUSE "Space"
# define KEY_PAUSE NULL
# define KEY_PLAY NULL
# define KEY_FASTER "Command+="
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment