From 5574820f13e6402b2377281886b23800c7eb9655 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 7 Apr 2015 12:02:33 +0200 Subject: ao_coreaudio: do not error if retrieving info for verbose mode fails The message log level shouldn't get to decide whether something fails or not. So replace the fatal error check on the verbose output code path with a warning. --- audio/out/ao_coreaudio_utils.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/audio/out/ao_coreaudio_utils.c b/audio/out/ao_coreaudio_utils.c index 64d98e5ece..8485011722 100644 --- a/audio/out/ao_coreaudio_utils.c +++ b/audio/out/ao_coreaudio_utils.c @@ -117,12 +117,12 @@ OSStatus ca_select_device(struct ao *ao, char* name, AudioDeviceID *device) if (mp_msg_test(ao->log, MSGL_V)) { char *desc; err = CA_GET_STR(*device, kAudioObjectPropertyName, &desc); - CHECK_CA_ERROR("could not get selected audio device name"); - - MP_VERBOSE(ao, "selected audio output device: %s (%" PRIu32 ")\n", - desc, *device); - - talloc_free(desc); + CHECK_CA_WARN("could not get selected audio device name"); + if (err == noErr) { + MP_VERBOSE(ao, "selected audio output device: %s (%" PRIu32 ")\n", + desc, *device); + talloc_free(desc); + } } coreaudio_error: -- cgit v1.2.3