diff options
| author | wm4 <wm4@nowhere> | 2015-04-07 12:02:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-04-07 12:23:24 +0200 |
| commit | 5574820f13e6402b2377281886b23800c7eb9655 (patch) | |
| tree | bbfb68b1baf6eaa2a72e6751fa97bd2603998b83 | |
| parent | c7a6b94d63aa4877906d29021ed29aeb2b07fb42 (diff) | |
| download | mpv-5574820f13e6402b2377281886b23800c7eb9655.tar.bz2 mpv-5574820f13e6402b2377281886b23800c7eb9655.tar.xz | |
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.
| -rw-r--r-- | audio/out/ao_coreaudio_utils.c | 12 |
1 files 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: |