player_thread: fix cross-fading duplicate chunk bug

When the decoder of the new song is not fast enough, the player thread has to wait for it for a moment. However the variable "nextChunk" was reset to -1 during that, making the next loop iteration assume that cross-fading has not begun yet. This patch overwrites it with "0" while waiting.

player_thread: fix cross-fading duplicate chunk bug
55b6fd2f · Max Kellermann · 96c18e7d · 55b6fd2f · 55b6fd2f
Commit 55b6fd2f authored Jan 04, 2009 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

NEWS NEWS +1 -0

player_thread.c src/player_thread.c +8 -0

No files found.
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ ver 0.15 - (200?/??/??)
 * failure to read the state file is non-fatal
 * fix minor memory leak in decoder_tag()
 * added Icy-Metadata support
+* fix cross-fading bug: it used to play some chunks of the new song twice
 ver 0.14 (2008/12/25)
 * audio outputs:

--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -451,6 +451,14 @@ static void do_play(void)
 						music_pipe_set_lazy(false);
 						notify_signal(&dc.notify);
 						notify_wait(&pc.notify);
+						/* set nextChunk to a
+						   non-negative value
+						   so the next
+						   iteration doesn't
+						   assume crossfading
+						   hasn't begun yet */
+						nextChunk = 0;
 						continue;
 					}
 				}