flac: check command after flac_process_single() failure

When the MPD core sends the decoder a command while flac_process_single() is executed, this function fails. Abort the decoder only if not seeking. This fixes a seeking bug.

flac: check command after flac_process_single() failure
efd60633 · Max Kellermann · 74a2813d · efd60633
Commit efd60633 authored Mar 05, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

flac_plugin.c src/decoder/flac_plugin.c +6 -3

No files found.
--- a/src/decoder/flac_plugin.c
+++ b/src/decoder/flac_plugin.c
@@ -353,9 +353,6 @@ flac_decode_internal(struct decoder * decoder,
 		} else
 			cmd = decoder_get_command(decoder);
-		if (!flac_process_single(flac_dec))
-			break;
 		if (cmd == DECODE_COMMAND_SEEK) {
 			FLAC__uint64 seek_sample = decoder_seek_where(decoder) *
 			    data.audio_format.sample_rate + 0.5;
@@ -368,6 +365,12 @@ flac_decode_internal(struct decoder * decoder,
 				decoder_seek_error(decoder);
 		} else if (flac_get_state(flac_dec) == flac_decoder_eof)
 			break;
+		if (!flac_process_single(flac_dec)) {
+			cmd = decoder_get_command(decoder);
+			if (cmd != DECODE_COMMAND_SEEK)
+				break;
+		}
 	}
 	if (cmd != DECODE_COMMAND_STOP) {
 		flacPrintErroredState(flac_get_state(flac_dec));