oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist: assert in playPlaylistIfPlayerStopped()

Browse Source 
The function playPlaylistIfPlayerStopped() is only called when the
player thread is stopped.  Converted that runtime check into an
assertion, and remove one indent level.
This commit is contained in:
Max Kellermann
2009-01-23 06:40:52 +01:00
parent cfbafbefdc
commit b5abc02379
1 changed files with 15 additions and 15 deletions

30
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)