player_thread: wait for decoder before seeking

When the decoder initialization has not been completed yet, all calls to dc_seek() will fail, because dc.seekable is not initialized yet. Wait for the decoder to complete its initialization, i.e. until it has called decoder_initialized().

player_thread: wait for decoder before seeking
209c8a54 · Max Kellermann · 1e9659bf · 209c8a54 · 209c8a54
Commit 209c8a54 authored Mar 25, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

decoder_control.c src/decoder_control.c +1 -0

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

No files found.
--- a/src/decoder_control.c
+++ b/src/decoder_control.c
@@ -86,6 +86,7 @@ dc_stop(struct notify *notify)
 bool
 dc_seek(struct notify *notify, double where)
 {
+	assert(dc.state != DECODE_STATE_START);
 	assert(where >= 0.0);

 	if (dc.state == DECODE_STATE_STOP ||

--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -301,6 +301,17 @@ static bool player_seek_decoder(struct player *player)
 		player->queued = false;
 	}

+	/* wait for the decoder to complete initialization */
+
+	while (player->decoder_starting) {
+		ret = player_check_decoder_startup(player);
+		if (!ret) {
+			/* decoder failure */
+			player_command_finished();
+			return false;
+		}
+	}
+
 	/* send the SEEK command */

 	where = pc.seek_where;