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
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 11 deletions

ShoutOutputPlugin.cxx src/output/plugins/ShoutOutputPlugin.cxx +5 -11

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

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