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.

don't call playerStop() before playerPlay()
110cef6f · Max Kellermann · 7125fdc4 · 110cef6f · 110cef6f · 110cef6f
Commit 110cef6f authored Aug 26, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 12 deletions

player.c src/player.c +3 -8

player.h src/player.h +0 -2

playlist.c src/playlist.c +0 -2

No files found.
--- a/src/player.c
+++ b/src/player.c
@@ -53,20 +53,15 @@ 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);

 	if (pc.state != PLAYER_STATE_STOP)
 		player_command(PLAYER_COMMAND_STOP);

 	pc.queueState = PLAYER_QUEUE_BLANK;
+
+	set_current_song(song);
+	player_command(PLAYER_COMMAND_PLAY);
 }

 void playerWait(void)

--- a/src/player.h
+++ b/src/player.h
@@ -109,8 +109,6 @@ void playerSetPause(int pause_flag);

 void playerPause(void);

-void playerStop(void);
-
 void playerKill(void);

 int getPlayerTotalTime(void);

--- a/src/playlist.c
+++ b/src/playlist.c
@@ -837,8 +837,6 @@ static void playPlaylistOrderNumber(int orderNum)
 {
 	char path_max_tmp[MPD_PATH_MAX];

-	playerStop();
-
 	playlist_state = PLAYLIST_STATE_PLAY;
 	playlist_noGoToNext = 0;
 	playlist.queued = -1;