diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-04 08:11:32 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-04 08:33:35 +0100 |
| commit | 78a9bc4a7deeacb40d755dc621560dc8e03ccd0a (patch) | |
| tree | 4a70a8eaff100f57d47bb189cf0b96821b977352 /osdep | |
| parent | 90875001793400c01f8290260cec2e284620477f (diff) | |
| download | mpv-78a9bc4a7deeacb40d755dc621560dc8e03ccd0a.tar.bz2 mpv-78a9bc4a7deeacb40d755dc621560dc8e03ccd0a.tar.xz | |
osx: fix -Wshadow warnings on platform specific code
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/macosx_events.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m index 23715acc52..ef67647f61 100644 --- a/osdep/macosx_events.m +++ b/osdep/macosx_events.m @@ -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 |