From 78a9bc4a7deeacb40d755dc621560dc8e03ccd0a Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Mon, 4 Nov 2013 08:11:32 +0100
Subject: osx: fix -Wshadow warnings on platform specific code

---
 audio/out/ao_coreaudio.c | 6 +++---
 osdep/macosx_events.m    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 0044a9ba4c..da526ada20 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -154,9 +154,9 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg)
         if (p->is_digital) {
             struct priv_d *d = p->digital;
             // Digital output has no volume adjust.
-            int vol = d->muted ? 0 : 100;
+            int digitalvol = d->muted ? 0 : 100;
             *control_vol = (ao_control_vol_t) {
-                .left = vol, .right = vol,
+                .left = digitalvol, .right = digitalvol,
             };
             return CONTROL_TRUE;
         }
@@ -216,7 +216,7 @@ static void print_list(struct ao *ao)
 
     for (int i = 0; i < n_devs; i++) {
         char *name;
-        OSStatus err = CA_GET_STR(devs[i], kAudioObjectPropertyName, &name);
+        err = CA_GET_STR(devs[i], kAudioObjectPropertyName, &name);
 
         if (err == noErr)
             talloc_steal(devs, name);
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
-- 
cgit v1.2.3