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().

player_control: lock player before setting seek parameters
93d8f9f0 · Max Kellermann · d1742a23 · 93d8f9f0
Commit 93d8f9f0 authored Nov 02, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

player_control.c src/player_control.c +6 -2

No files found.
--- 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);