player_thread: fix assertion failure due to wrong music pipe on seek

When one song is played twice, and the decoder is working on the second "instance", but the first should be seeked, the check in player_seek_decoder() may assume that it can reuse the decoder without exchanging pipes. The last thing was the mistake: the pipe pointer was different, which led to an assertion failure. This patch adds another check which exchanges the player pipe.

player_thread: fix assertion failure due to wrong music pipe on seek
83ec0e55 · Max Kellermann · cc261872 · 83ec0e55 · 83ec0e55
Commit 83ec0e55 authored Nov 05, 2010 by Max Kellermann
Hide 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
 ver 0.15.14 (2010/??/??)
+* player_thread: fix assertion failure due to wrong music pipe on seek
 * output_thread: fix assertion failure due to race condition in OPEN
 * input:
  - rewind: fix double free bug

--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -334,6 +334,14 @@ static bool player_seek_decoder(struct player *player)
 			return false;
 		}
 	} else {
+		if (!player_dc_at_current_song(player)) {
+			/* the decoder is already decoding the "next" song,
+			   but it is the same song file; exchange the pipe */
+			music_pipe_clear(player->pipe, player_buffer);
+			music_pipe_free(player->pipe);
+			player->pipe = dc.pipe;
+		}
+
 		pc.next_song = NULL;
 		player->queued = false;
 	}