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

player_thread: lock inside player_wait_for_decoder()

Browse Source 
Lock the player_control object when modifying its attributes.
This commit is contained in:
Max Kellermann 2009-11-03 21:02:54 +01:00
parent 6c78c21fb8
commit 98150f503a
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/player_thread.c
View File

@ -175,6 +175,11 @@ player_wait_for_decoder(struct player *player)
{
struct decoder_control *dc = player->dc;
assert(player->queued);
assert(pc.next_song != NULL);
player->queued = false;
if (decoder_lock_has_failed(dc)) {
player_lock();
pc.errored_song = dc->song;
@ -182,24 +187,29 @@ player_wait_for_decoder(struct player *player)
pc.next_song = NULL;
player_unlock();
player->queued = false;
return false;
}
pc.total_time = pc.next_song->tag != NULL
? pc.next_song->tag->time : 0;
pc.bit_rate = 0;
audio_format_clear(&pc.audio_format);
player->song = pc.next_song;
pc.next_song = NULL;
player->queued = false;
player->elapsed_time = 0.0;
/* set the "starting" flag, which will be cleared by
player_check_decoder_startup() */
player->decoder_starting = true;
player_lock();
/* update player_control's song information */
pc.total_time = pc.next_song->tag != NULL
? pc.next_song->tag->time : 0;
pc.bit_rate = 0;
audio_format_clear(&pc.audio_format);
/* clear the queued song */
pc.next_song = NULL;
player_unlock();
/* call syncPlaylistWithQueue() in the main thread */
event_pipe_emit(PIPE_EVENT_PLAYLIST);