summaryrefslogtreecommitdiff
path: root/src/output/plugins
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2020-05-28 15:02:14 +0200
committerMax Kellermann <max@musicpd.org>2020-07-01 22:05:11 +0200
commitbbceb5eb91702dd83b1552bba5ea8b1bef3ead42 (patch)
tree6c28287292415cc57651eb17d8ee9566e7686780 /src/output/plugins
parent90d85319c2bd9bc957291380e33c4ea0a7c3328e (diff)
output/osx: silently ignore some errors in osx_output_set_device()
Diffstat (limited to 'src/output/plugins')
-rw-r--r--src/output/plugins/OSXOutputPlugin.cxx12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/output/plugins/OSXOutputPlugin.cxx b/src/output/plugins/OSXOutputPlugin.cxx
index af9fd79d4..7136da5ad 100644
--- a/src/output/plugins/OSXOutputPlugin.cxx
+++ b/src/output/plugins/OSXOutputPlugin.cxx
@@ -674,20 +674,14 @@ osx_output_set_device(OSXOutput *oo)
status = AudioObjectGetPropertyData(deviceids[i], &aopa_name,
0, nullptr,
&size, &cfname);
- if (status != noErr) {
- char errormsg[1024];
- osx_os_status_to_cstring(status, errormsg, sizeof(errormsg));
- throw FormatRuntimeError("Unable to determine OS X device name "
- "(device %u): %s",
- (unsigned int) deviceids[i],
- errormsg);
- }
+ if (status != noErr)
+ continue;
const Apple::StringRef cfname_(cfname);
char name[256];
if (!cfname_.GetCString(name, sizeof(name)))
- throw std::runtime_error("Unable to convert device name from CFStringRef to char*");
+ continue;
if (StringIsEqual(oo->device_name, name)) {
FormatDebug(osx_output_domain,