From 93d8f9f00e838b4b0054ea6487d8810bfa60628d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 2 Nov 2009 17:02:05 +0100 Subject: player_control: lock player before setting seek parameters These parameters must be protected with a mutex, too. Wrap everything inside player_lock()/player_unlock(), and use player_command_locked() instead of player_command(). --- src/player_control.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/player_control.c') diff --git a/src/player_control.c b/src/player_control.c index ab162ef2..42dc9e1c 100644 --- a/src/player_control.c +++ b/src/player_control.c @@ -258,8 +258,10 @@ pc_enqueue_song(struct song *song) assert(song != NULL); assert(pc.next_song == NULL); + player_lock(); pc.next_song = song; - player_command(PLAYER_COMMAND_QUEUE); + player_command_locked(PLAYER_COMMAND_QUEUE); + player_unlock(); } bool @@ -270,9 +272,11 @@ pc_seek(struct song *song, float seek_time) if (pc.state == PLAYER_STATE_STOP) return false; + player_lock(); pc.next_song = song; pc.seek_where = seek_time; - player_command(PLAYER_COMMAND_SEEK); + player_command_locked(PLAYER_COMMAND_SEEK); + player_unlock(); assert(pc.next_song == NULL); -- cgit v1.2.3