summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_coreaudio.c
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-04 08:11:32 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-04 08:33:35 +0100
commit78a9bc4a7deeacb40d755dc621560dc8e03ccd0a (patch)
tree4a70a8eaff100f57d47bb189cf0b96821b977352 /audio/out/ao_coreaudio.c
parent90875001793400c01f8290260cec2e284620477f (diff)
downloadmpv-78a9bc4a7deeacb40d755dc621560dc8e03ccd0a.tar.bz2
mpv-78a9bc4a7deeacb40d755dc621560dc8e03ccd0a.tar.xz
osx: fix -Wshadow warnings on platform specific code
Diffstat (limited to 'audio/out/ao_coreaudio.c')
-rw-r--r--audio/out/ao_coreaudio.c6
1 files changed, 3 insertions, 3 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);