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

This order will be necessary for proper AudioFormat initialization, because the encoder may change the format.

output/Shout: open the encoder first, then open connection
3ab90564 · Max Kellermann · f46d5453 · 3ab90564
Commit 3ab90564 authored Aug 08, 2017 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

ShoutOutputPlugin.cxx src/output/plugins/ShoutOutputPlugin.cxx +2 -8

No files found.
--- a/src/output/plugins/ShoutOutputPlugin.cxx
+++ b/src/output/plugins/ShoutOutputPlugin.cxx
@@ -348,21 +348,15 @@ ShoutOpen(shout_t *shout_conn)
 void
 ShoutOutput::Open(AudioFormat &audio_format)
 {
-	ShoutOpen(shout_conn);
-
-	try {
 	encoder = prepared_encoder->Open(audio_format);

 	try {
+		ShoutOpen(shout_conn);
 		WritePage();
-		} catch (const std::runtime_error &) {
+	} catch (...) {
 		delete encoder;
 		throw;
 	}
-	} catch (const std::runtime_error &) {
-		shout_close(shout_conn);
-		throw;
-	}
 }

 std::chrono::steady_clock::duration