From b5abc023797da97fbd8c2af737f38d0c2fd07edc Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 23 Jan 2009 06:40:52 +0100 Subject: playlist: assert in playPlaylistIfPlayerStopped() The function playPlaylistIfPlayerStopped() is only called when the player thread is stopped. Converted that runtime check into an assertion, and remove one indent level. --- src/playlist.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/playlist.c b/src/playlist.c index 00341ce06..2c6728923 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -783,23 +783,23 @@ void nextSongInPlaylist(void) static void playPlaylistIfPlayerStopped(void) { - if (getPlayerState() == PLAYER_STATE_STOP) { - enum player_error error = getPlayerError(); + enum player_error error; - if (error == PLAYER_ERROR_NOERROR) - playlist_errorCount = 0; - else - playlist_errorCount++; + assert(playlist.playing); + assert(getPlayerState() == PLAYER_STATE_STOP); - if (playlist.playing - && ((playlist_stopOnError && error != PLAYER_ERROR_NOERROR) - || error == PLAYER_ERROR_AUDIO - || error == PLAYER_ERROR_SYSTEM - || playlist_errorCount >= queue_length(&playlist.queue))) { - stopPlaylist(); - } else - nextSongInPlaylist(); - } + error = getPlayerError(); + if (error == PLAYER_ERROR_NOERROR) + playlist_errorCount = 0; + else + playlist_errorCount++; + + if ((playlist_stopOnError && error != PLAYER_ERROR_NOERROR) || + error == PLAYER_ERROR_AUDIO || error == PLAYER_ERROR_SYSTEM || + playlist_errorCount >= queue_length(&playlist.queue)) + stopPlaylist(); + else + nextSongInPlaylist(); } bool getPlaylistRepeatStatus(void) -- cgit v1.2.3