decoder_thread: reopen the stream after file_decode() has failed

When decoding a local file, the decoder thread tries to run all matching decoders, until one succeeds. Both file_decode() and stream_decode() can decode a stream, but MPD closes the stream before calling file_decode(). Problem is: when this decoder fails, and the next's stream_decode() method is invoked, the input_stream is still closed. This patch reopens it.

decoder_thread: reopen the stream after file_decode() has failed
2536b0da · Max Kellermann · d5ddecb1 · 2536b0da
Commit 2536b0da authored Jun 19, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

decoder_thread.c src/decoder_thread.c +11 -0

No files found.
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -186,6 +186,17 @@ static void decoder_run_song(const struct song *song, const char *uri)
 				if (ret)
 					break;
 			} else if (plugin->stream_decode != NULL) {
+				if (!close_instream) {
+					/* the input_stream object has
+					   been closed before
+					   decoder_file_decode() -
+					   reopen it */
+					if (input_stream_open(&input_stream, uri))
+						close_instream = true;
+					else
+						continue;
+				}
+
 				ret = decoder_stream_decode(plugin, &decoder,
 							    &input_stream);
 				if (ret)