diff options
| author | wm4 <wm4@nowhere> | 2015-06-09 18:23:44 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-09 18:26:14 +0200 |
| commit | b7d833c2a6466dc8231c7a0a5eb5372b85910fc7 (patch) | |
| tree | 2682d08d20bb793f79ce7254e346ba6ed642b90d /audio/out | |
| parent | 211088943c494adf4313c0b4bca8d99eca81436a (diff) | |
| download | mpv-b7d833c2a6466dc8231c7a0a5eb5372b85910fc7.tar.bz2 mpv-b7d833c2a6466dc8231c7a0a5eb5372b85910fc7.tar.xz | |
ao_coreaudio: change physical stream format synchronously
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao_coreaudio.c | 5 | ||||
| -rw-r--r-- | audio/out/ao_coreaudio_utils.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 9bb52f47a7..ea780a9d1e 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -224,10 +224,7 @@ static void init_physical_format(struct ao *ao) &p->original_asbd); CHECK_CA_WARN("could not get current physical stream format"); - ca_print_asbd(ao, "Trying to set physical format:", &best_asbd); - err = CA_SET(streams[i], kAudioStreamPropertyPhysicalFormat, - &best_asbd); - CHECK_CA_ERROR("could not set physical format"); + ca_change_physical_format_sync(ao, streams[i], best_asbd); break; } } diff --git a/audio/out/ao_coreaudio_utils.c b/audio/out/ao_coreaudio_utils.c index 912497b2a2..b861fa3686 100644 --- a/audio/out/ao_coreaudio_utils.c +++ b/audio/out/ao_coreaudio_utils.c @@ -456,7 +456,7 @@ bool ca_change_physical_format_sync(struct ao *ao, AudioStreamID stream, OSStatus err = noErr; bool format_set = false; - ca_print_asbd(ao, "setting stream format:", &change_format); + ca_print_asbd(ao, "setting stream physical format:", &change_format); sem_t wakeup; if (sem_init(&wakeup, 0, 0)) { |