diff options
| -rw-r--r-- | src/command.c | 7 | ||||
| -rw-r--r-- | src/player.c | 37 | ||||
| -rw-r--r-- | src/player.h | 10 | ||||
| -rw-r--r-- | src/playlist.c | 23 |
4 files changed, 30 insertions, 47 deletions
diff --git a/src/command.c b/src/command.c index 342729fd5..04220018e 100644 --- a/src/command.c +++ b/src/command.c @@ -292,9 +292,12 @@ static int handlePause(int fd, mpd_unused int *permission, int pause_flag; if (check_int(fd, &pause_flag, argv[1], check_boolean, argv[1]) < 0) return -1; - return playerSetPause(fd, pause_flag); + playerSetPause(pause_flag); + return 0; } - return playerPause(fd); + + playerPause(); + return 0; } static int commandStatus(mpd_unused int fd, mpd_unused int *permission, diff --git a/src/player.c b/src/player.c index 9ca4c6b95..fae405ae3 100644 --- a/src/player.c +++ b/src/player.c @@ -27,14 +27,10 @@ static void playerCloseAudio(void); -int playerWait(int fd) +void playerWait(void) { - if (playerStop(fd) < 0) - return -1; - + playerStop(); playerCloseAudio(); - - return 0; } static void set_current_song(Song *song) @@ -63,42 +59,35 @@ void player_command_finished() wakeup_main_task(); } -int playerPlay(int fd, Song * song) +void playerPlay(Song * song) { - if (playerStop(fd) < 0) - return -1; + playerStop(); set_current_song(song); player_command(PLAYER_COMMAND_PLAY); - - return 0; } -int playerStop(mpd_unused int fd) +void playerStop(void) { if (pc.state != PLAYER_STATE_STOP) player_command(PLAYER_COMMAND_STOP); pc.queueState = PLAYER_QUEUE_BLANK; playerQueueUnlock(); - - return 0; } void playerKill(void) /* deprecated */ { - playerPause(STDERR_FILENO); + playerPause(); } -int playerPause(mpd_unused int fd) +void playerPause(void) { if (pc.state != PLAYER_STATE_STOP) player_command(PLAYER_COMMAND_PAUSE); - - return 0; } -int playerSetPause(int fd, int pause_flag) +void playerSetPause(int pause_flag) { switch (pc.state) { case PLAYER_STATE_STOP: @@ -106,15 +95,13 @@ int playerSetPause(int fd, int pause_flag) case PLAYER_STATE_PLAY: if (pause_flag) - playerPause(fd); + playerPause(); break; case PLAYER_STATE_PAUSE: if (!pause_flag) - playerPause(fd); + playerPause(); break; } - - return 0; } int getPlayerElapsedTime(void) @@ -180,9 +167,7 @@ char *getPlayerErrorStr(void) static void playerCloseAudio(void) { - if (playerStop(STDERR_FILENO) < 0) - return; - + playerStop(); player_command(PLAYER_COMMAND_CLOSE_AUDIO); } diff --git a/src/player.h b/src/player.h index 08405032d..2b1e6d992 100644 --- a/src/player.h +++ b/src/player.h @@ -85,13 +85,13 @@ typedef struct _PlayerControl { void player_command_finished(void); -int playerPlay(int fd, Song * song); +void playerPlay(Song * song); -int playerSetPause(int fd, int pause_flag); +void playerSetPause(int pause_flag); -int playerPause(int fd); +void playerPause(void); -int playerStop(int fd); +void playerStop(void); void playerKill(void); @@ -109,7 +109,7 @@ char *getPlayerErrorStr(void); int getPlayerError(void); -int playerWait(int fd); +void playerWait(void); int queueSong(Song * song); diff --git a/src/playlist.c b/src/playlist.c index f878de643..bb706002f 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -286,7 +286,7 @@ static void loadPlaylistFromStateFile(FILE *fp, char *buffer, playlist.length - 1, 0); } if (state == PLAYER_STATE_PAUSE) { - playerPause(STDERR_FILENO); + playerPause(); } if (state != PLAYER_STATE_STOP) { seekSongInPlaylist(STDERR_FILENO, @@ -790,7 +790,7 @@ int deleteFromPlaylist(int fd, int song) && playlist.current == songOrder) { /*if(playlist.current>=playlist.length) return playerStop(fd); else return playPlaylistOrderNumber(fd,playlist.current); */ - playerWait(STDERR_FILENO); + playerWait(); playlist_noGoToNext = 1; } @@ -828,11 +828,10 @@ void deleteASongFromPlaylist(Song * song) } } -int stopPlaylist(int fd) +int stopPlaylist(mpd_unused int fd) { DEBUG("playlist: stop\n"); - if (playerWait(fd) < 0) - return -1; + playerWait(); playlist.queued = -1; playlist_state = PLAYLIST_STATE_STOP; playlist_noGoToNext = 0; @@ -841,12 +840,11 @@ int stopPlaylist(int fd) return 0; } -static int playPlaylistOrderNumber(int fd, int orderNum) +static int playPlaylistOrderNumber(mpd_unused int fd, int orderNum) { char path_max_tmp[MPD_PATH_MAX]; - if (playerStop(fd) < 0) - return -1; + playerStop(); playlist_state = PLAYLIST_STATE_PLAY; playlist_noGoToNext = 0; @@ -857,11 +855,7 @@ static int playPlaylistOrderNumber(int fd, int orderNum) get_song_url(path_max_tmp, playlist.songs[playlist.order[orderNum]])); - if (playerPlay(fd, (playlist.songs[playlist.order[orderNum]])) < 0) { - stopPlaylist(fd); - return -1; - } - + playerPlay(playlist.songs[playlist.order[orderNum]]); playlist.current = orderNum; return 0; @@ -878,7 +872,8 @@ int playPlaylist(int fd, int song, int stopOnError) return 0; if (playlist_state == PLAYLIST_STATE_PLAY) { - return playerSetPause(fd, 0); + playerSetPause(0); + return 0; } if (playlist.current >= 0 && playlist.current < playlist.length) { i = playlist.current; |