diff options
| -rw-r--r-- | src/playlist.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/playlist.c b/src/playlist.c index cb9314661..4c0737d1b 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -783,6 +783,16 @@ int currentSongInPlaylist(FILE * fp) { return 0; } +void incrPlaylistCurrent() { + if(playlist.current >= playlist.length || (!playlist.repeat && + playlist.current == playlist.length-1)) + { + playlist.current = -1; + } + else if(playlist.current == playlist.length-1) playlist.current = 0; + else if(playlist.current >= 0) playlist.current++; +} + int nextSongInPlaylist(FILE * fp) { if(playlist_state!=PLAYLIST_STATE_PLAY) return 0; @@ -798,22 +808,13 @@ int nextSongInPlaylist(FILE * fp) { return playPlaylistOrderNumber(fp,0); } else { + incrPlaylistCurrent(); return stopPlaylist(fp);; } return 0; } -void incrPlaylistCurrent() { - if(playlist.current >= playlist.length || (!playlist.repeat && - playlist.current == playlist.length-1)) - { - playlist.current = -1; - } - else if(playlist.current == playlist.length-1) playlist.current = 0; - else if(playlist.current >= 0) playlist.current++; -} - void playPlaylistIfPlayerStopped() { if(getPlayerState()==PLAYER_STATE_STOP) { int error = getPlayerError(); |