Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

osx: fix -Wshadow warnings on platform specific code

Browse Source
This commit is contained in:
Stefano Pigozzi
2013-11-04 08:11:32 +01:00
parent 9087500179
commit 78a9bc4a7d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osdep/macosx_events.m
View File

@@ -242,7 +242,7 @@ void cocoa_put_key_with_modifiers(int keycode, int modifiers)
- (BOOL)handleMediaKey:(NSEvent *)event
{
NSDictionary *keymap = @{
NSDictionary *keymapd = @{
@(NX_KEYTYPE_PLAY): @(MP_KEY_PLAY),
@(NX_KEYTYPE_REWIND): @(MP_KEY_PREV),
@(NX_KEYTYPE_FAST): @(MP_KEY_NEXT),
@@ -250,7 +250,7 @@ void cocoa_put_key_with_modifiers(int keycode, int modifiers)
return [self handleKey:mk_code(event)
withMask:[self keyModifierMask:event]
andMapping:keymap];
andMapping:keymapd];
}
- (void)hidRemote:(HIDRemote *)remote
@@ -260,7 +260,7 @@ void cocoa_put_key_with_modifiers(int keycode, int modifiers)
{
if (!isPressed) return;
NSDictionary *keymap = @{
NSDictionary *keymapd = @{
@(kHIDRemoteButtonCodePlay): @(MP_AR_PLAY),
@(kHIDRemoteButtonCodePlayHold): @(MP_AR_PLAY_HOLD),
@(kHIDRemoteButtonCodeCenter): @(MP_AR_CENTER),
@@ -277,7 +277,7 @@ void cocoa_put_key_with_modifiers(int keycode, int modifiers)
@(kHIDRemoteButtonCodeDownHold): @(MP_AR_VDOWN_HOLD),
};
[self handleKey:buttonCode withMask:0 andMapping:keymap];
[self handleKey:buttonCode withMask:0 andMapping:keymapd];
}
- (int)mapKeyModifiers:(int)cocoaModifiers