oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/Multiple: obtain detailed error information in Open()

Browse Source
This commit is contained in:
Max Kellermann 2016-12-29 14:26:10 +01:00
parent ef9acc54ec
commit 256f40d4f5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/output/MultipleOutputs.cxx
View File

@ -228,12 +228,16 @@ MultipleOutputs::Open(const AudioFormat audio_format,
EnableDisable(); EnableDisable();
Update(); Update();
std::exception_ptr first_error;
for (auto ao : outputs) { for (auto ao : outputs) {
if (ao->enabled) if (ao->enabled)
enabled = true; enabled = true;
if (ao->open) if (ao->open)
ret = true; ret = true;
else if (ao->last_error && !first_error)
first_error = ao->last_error;
} }
if (!enabled) { if (!enabled) {
@ -243,8 +247,12 @@ MultipleOutputs::Open(const AudioFormat audio_format,
} else if (!ret) { } else if (!ret) {
/* close all devices if there was an error */ /* close all devices if there was an error */
Close(); Close();
/* TODO: obtain real error */
throw std::runtime_error("Failed to open audio output"); if (first_error)
/* we have details, so throw that */
std::rethrow_exception(first_error);
else
throw std::runtime_error("Failed to open audio output");
} }
} }