oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

player_thread: reset pc.next_song

Browse Source 
After a player command (successful or not), reset pc.next_song,
because the queue is supposed to be empty then.  Otherwise,
playlist.queued and pc.next_song may disagree, which triggers an
assertion failure.
This commit is contained in:
Max Kellermann 2009-02-10 00:17:34 +01:00
parent 710b3275ea
commit 2274434e53
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/player_thread.c
View File

@ -92,6 +92,7 @@ static void player_stop_decoder(void)
{ {
dc_stop(&pc.notify); dc_stop(&pc.notify);
pc.state = PLAYER_STATE_STOP; pc.state = PLAYER_STATE_STOP;
pc.next_song = NULL;
event_pipe_emit(PIPE_EVENT_PLAYLIST); event_pipe_emit(PIPE_EVENT_PLAYLIST);
} }
@ -104,6 +105,7 @@ player_wait_for_decoder(struct player *player)
assert(dc.next_song == NULL || dc.next_song->url != NULL); assert(dc.next_song == NULL || dc.next_song->url != NULL);
pc.errored_song = dc.next_song; pc.errored_song = dc.next_song;
pc.error = PLAYER_ERROR_FILE; pc.error = PLAYER_ERROR_FILE;
pc.next_song = NULL;
return false; return false;
} }
@ -138,6 +140,9 @@ static bool player_seek_decoder(struct player *player)
ret = player_wait_for_decoder(player); ret = player_wait_for_decoder(player);
if (!ret) if (!ret)
return false; return false;
} else {
pc.next_song = NULL;
player->queued = false;
} }
where = pc.seek_where; where = pc.seek_where;
@ -523,6 +528,7 @@ static gpointer player_task(G_GNUC_UNUSED gpointer arg)
case PLAYER_COMMAND_STOP: case PLAYER_COMMAND_STOP:
case PLAYER_COMMAND_SEEK: case PLAYER_COMMAND_SEEK:
case PLAYER_COMMAND_PAUSE: case PLAYER_COMMAND_PAUSE:
pc.next_song = NULL;
player_command_finished(); player_command_finished();
break; break;