decoder_thread: eliminate jitter after seek failure

Don't clear the music pipe when seeking has failed - check the "seeking" flag instead of "command==SEEK". Clear the "seeking" flag in decoder_seek_error().

decoder_thread: eliminate jitter after seek failure
915d1d07 · Max Kellermann · 8a6d448a · 915d1d07 · 915d1d07
Commit 915d1d07 authored Dec 26, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

NEWS NEWS +1 -0

decoder_api.c src/decoder_api.c +5 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ ver 0.15.7 (2009/??/??)
 * tags:
  - id3: fix ID3v1 charset conversion
 * decoders:
+  - eliminate jitter after seek failure
  - ffmpeg: don't try to force stereo
  - wavpack: allow fine-grained seeking
 * mixer: explicitly close all mixers on shutdown

--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -93,7 +93,9 @@ void decoder_command_finished(G_GNUC_UNUSED struct decoder * decoder)
 	       dc.seek_error || decoder->seeking);
 	assert(dc.pipe != NULL);

-	if (dc.command == DECODE_COMMAND_SEEK) {
+	if (decoder->seeking) {
+		decoder->seeking = false;
+
 		/* delete frames from the old song position */

 		if (decoder->chunk != NULL) {
@@ -124,6 +126,8 @@ void decoder_seek_error(struct decoder * decoder)
 	assert(dc.pipe != NULL);

 	dc.seek_error = true;
+	decoder->seeking = false;
+
 	decoder_command_finished(decoder);
 }