summaryrefslogtreecommitdiffstats
path: root/audio/out
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-04-26 18:35:37 +0200
committerwm4 <wm4@nowhere>2016-04-26 18:35:37 +0200
commit66a958bb4fa43c2fcc7362baed6c85f4f871b00d (patch)
tree9415aab8b56c9bd75df6b6e4a145089a6161aca3 /audio/out
parentdfe40f770df7cc86c574fa290360f5d065fee7b5 (diff)
downloadmpv-66a958bb4fa43c2fcc7362baed6c85f4f871b00d.tar.bz2
mpv-66a958bb4fa43c2fcc7362baed6c85f4f871b00d.tar.xz
ao_coreaudio: remove detected_device
Setting this here is a race condition. It's called from a CoreAudio callbacks, and there are no locks. It's a string, so this can be potentially severe. It's hard to fix and only CoreAudio supported it, so remove it. This causes the "audio-out-detected-device" property to return nothing on all platforms.
Diffstat (limited to 'audio/out')
-rw-r--r--audio/out/ao_coreaudio.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 471ab6d928..b0a5dc0da1 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -133,11 +133,6 @@ static bool reinit_device(struct ao *ao) {
OSStatus err = ca_select_device(ao, ao->device, &p->device);
CHECK_CA_ERROR("failed to select device");
- char *uid;
- err = CA_GET_STR(p->device, kAudioDevicePropertyDeviceUID, &uid);
- CHECK_CA_ERROR("failed to get device UID");
- ao->detected_device = talloc_steal(ao, uid);
-
return true;
coreaudio_error: