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

output/Shout: open the encoder first, then open connection

Browse Source 
This order will be necessary for proper AudioFormat initialization,
because the encoder may change the format.
This commit is contained in:
Max Kellermann 2017-08-08 18:41:35 +02:00
parent f46d545307
commit 3ab905644d
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/output/plugins/ShoutOutputPlugin.cxx
View File

@ -348,19 +348,13 @@ ShoutOpen(shout_t *shout_conn)
void void
ShoutOutput::Open(AudioFormat &audio_format) ShoutOutput::Open(AudioFormat &audio_format)
{ {
ShoutOpen(shout_conn); encoder = prepared_encoder->Open(audio_format);
try { try {
encoder = prepared_encoder->Open(audio_format); ShoutOpen(shout_conn);
WritePage();
try { } catch (...) {
WritePage(); delete encoder;
} catch (const std::runtime_error &) {
delete encoder;
throw;
}
} catch (const std::runtime_error &) {
shout_close(shout_conn);
throw; throw;
} }
} }