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 +++--------
src/player.h | 2 --
src/playlist.c | 2 --
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/player.c b/src/player.c
index 6a2c3a0..4de92fb 100644
--- 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)
diff --git a/src/player.h b/src/player.h
index de237c4..a4db82d 100644
--- 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);
diff --git a/src/playlist.c b/src/playlist.c
index 0f6f1d0..e5aad2e 100644
--- 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;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
