From 78a9bc4a7deeacb40d755dc621560dc8e03ccd0a Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 4 Nov 2013 08:11:32 +0100 Subject: osx: fix -Wshadow warnings on platform specific code --- audio/out/ao_coreaudio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'audio/out/ao_coreaudio.c') 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); -- cgit v1.2.3