not sure if i changed anything, but what the hey
git-svn-id: https://svn.musicpd.org/mpd/trunk@1285 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
4d14e3a4dd
commit
3520a93bc2
|
@ -668,7 +668,6 @@ int playPlaylistOrderNumber(FILE * fp, int orderNum) {
|
|||
playlist_noGoToNext = 0;
|
||||
playlist.queued = -1;
|
||||
playlist_queueError = 0;
|
||||
playlist.current = orderNum;
|
||||
|
||||
DEBUG("playlist: play %i:\"%s\"\n",orderNum,
|
||||
(playlist.songs[playlist.order[orderNum]])->utf8url);
|
||||
|
@ -677,6 +676,9 @@ int playPlaylistOrderNumber(FILE * fp, int orderNum) {
|
|||
stopPlaylist(fp);
|
||||
return -1;
|
||||
}
|
||||
else playlist.current++;
|
||||
|
||||
playlist.current = orderNum;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -799,6 +801,16 @@ int nextSongInPlaylist(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++;
|
||||
}
|
||||
|
||||
void playPlaylistIfPlayerStopped() {
|
||||
if(getPlayerState()==PLAYER_STATE_STOP) {
|
||||
int error = getPlayerError();
|
||||
|
|
Loading…
Reference in New Issue