From 110cef6fda704ae9ea806c13ef346de6a1059a9f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:27:17 +0200 Subject: don't call playerStop() before playerPlay() Since playerPlay() already calls playerStop(), we can remove its invocation of playerStop() from playPlaylistOrderNumber(). We can also make playerStop a static function. --- src/player.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/player.c') diff --git a/src/player.c b/src/player.c index 6a2c3a08e..4de92fb8e 100644 --- a/src/player.c +++ b/src/player.c @@ -52,14 +52,6 @@ void player_command_finished() } void playerPlay(Song * song) -{ - playerStop(); - - set_current_song(song); - player_command(PLAYER_COMMAND_PLAY); -} - -void playerStop(void) { assert(pc.queueLockState == PLAYER_QUEUE_UNLOCKED); @@ -67,6 +59,9 @@ void playerStop(void) player_command(PLAYER_COMMAND_STOP); pc.queueState = PLAYER_QUEUE_BLANK; + + set_current_song(song); + player_command(PLAYER_COMMAND_PLAY); } void playerWait(void) -- cgit v1.2.3