Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
f95c2c87
Commit
f95c2c87
authored
Apr 09, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: handle space key by core, used as default setting for play / pause
parent
15bc6f28
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
17 deletions
+4
-17
modules/gui/macosx/MainMenu.m
modules/gui/macosx/MainMenu.m
+1
-5
modules/gui/macosx/VideoView.m
modules/gui/macosx/VideoView.m
+2
-6
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+0
-5
src/libvlc-module.c
src/libvlc-module.c
+1
-1
No files found.
modules/gui/macosx/MainMenu.m
View file @
f95c2c87
...
@@ -157,11 +157,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
...
@@ -157,11 +157,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[
o_mi_quit
setKeyEquivalentModifierMask
:
[
o_vlcstringutility
VLCModifiersToCocoa
:
o_key
]];
[
o_mi_quit
setKeyEquivalentModifierMask
:
[
o_vlcstringutility
VLCModifiersToCocoa
:
o_key
]];
FREENULL
(
key
);
FREENULL
(
key
);
key
=
config_GetPsz
(
p_intf
,
"key-play-pause"
);
// do not assign play/pause key
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
);
key
=
config_GetPsz
(
p_intf
,
"key-stop"
);
key
=
config_GetPsz
(
p_intf
,
"key-stop"
);
o_key
=
[
NSString
stringWithFormat
:
@"%s"
,
key
];
o_key
=
[
NSString
stringWithFormat
:
@"%s"
,
key
];
...
...
modules/gui/macosx/VideoView.m
View file @
f95c2c87
...
@@ -133,12 +133,8 @@
...
@@ -133,12 +133,8 @@
else
if
(
key
==
'f'
&&
i_pressed_modifiers
&
NSControlKeyMask
&&
i_pressed_modifiers
&
NSCommandKeyMask
)
else
if
(
key
==
'f'
&&
i_pressed_modifiers
&
NSControlKeyMask
&&
i_pressed_modifiers
&
NSCommandKeyMask
)
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
else
if
(
p_vout
)
{
else
if
(
p_vout
)
{
if
(
key
==
' '
)
val
.
i_int
|=
(
int
)
CocoaKeyToVLC
(
key
);
[[
VLCCoreInteraction
sharedInstance
]
playOrPause
];
var_Set
(
p_vout
->
p_libvlc
,
"key-pressed"
,
val
);
else
{
val
.
i_int
|=
(
int
)
CocoaKeyToVLC
(
key
);
var_Set
(
p_vout
->
p_libvlc
,
"key-pressed"
,
val
);
}
}
}
else
else
msg_Dbg
(
VLCIntf
,
"could not send keyevent to VLC core"
);
msg_Dbg
(
VLCIntf
,
"could not send keyevent to VLC core"
);
...
...
modules/gui/macosx/intf.m
View file @
f95c2c87
...
@@ -1202,11 +1202,6 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1202,11 +1202,6 @@ static VLCMain *_o_sharedMainInstance = nil;
}
}
}
}
if
(
key
==
0x0020
)
{
// space key
[[
VLCCoreInteraction
sharedInstance
]
playOrPause
];
return
YES
;
}
val
.
i_int
|=
CocoaKeyToVLC
(
key
);
val
.
i_int
|=
CocoaKeyToVLC
(
key
);
BOOL
b_found_key
=
NO
;
BOOL
b_found_key
=
NO
;
...
...
src/libvlc-module.c
View file @
f95c2c87
...
@@ -2146,7 +2146,7 @@ vlc_module_begin ()
...
@@ -2146,7 +2146,7 @@ vlc_module_begin ()
*/
*/
# define KEY_TOGGLE_FULLSCREEN "Command+f"
# define KEY_TOGGLE_FULLSCREEN "Command+f"
# define KEY_LEAVE_FULLSCREEN "Esc"
# define KEY_LEAVE_FULLSCREEN "Esc"
# define KEY_PLAY_PAUSE "
Command+p
"
# define KEY_PLAY_PAUSE "
Space
"
# define KEY_PAUSE NULL
# define KEY_PAUSE NULL
# define KEY_PLAY NULL
# define KEY_PLAY NULL
# define KEY_FASTER "Command+="
# define KEY_FASTER "Command+="
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment