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.

playlist: assert in playPlaylistIfPlayerStopped()
b5abc023 · Max Kellermann · cfbafbef · b5abc023
Commit b5abc023 authored Jan 23, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 15 deletions

playlist.c src/playlist.c +15 -15

No files found.
--- 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)