player_thread: detect finished queued song

When the decoder finishes the "queued" song very quickly (before the "current" song finishes playing), an assertion in do_play() fails because it thinks that it should start decoding the queued song, although that has in fact just finished.

player_thread: detect finished queued song
507606bb · Max Kellermann · f421c8a1 · 507606bb
Commit 507606bb authored Nov 03, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

player_thread.c src/player_thread.c +2 -1

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -817,7 +817,8 @@ static void do_play(struct decoder_control *dc)
 		*/
 #endif

-		if (decoder_lock_is_idle(dc) && player.queued) {
+		if (decoder_lock_is_idle(dc) && player.queued &&
+		    dc->pipe == player.pipe) {
 			/* the decoder has finished the current song;
 			   make it decode the next song */
 			assert(dc->pipe == NULL || dc->pipe == player.pipe);