aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-06-01 14:16:17 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-06-01 14:16:17 +0000
commit3520a93bc2916dc1b35ff9ce35bdf76c5d9538b1 (patch)
treee63208c00aff6ff743796e615c1b132385925ff7
parent4d14e3a4dd8a96a8bb37bae46f54965cceb13c36 (diff)
downloadmpd-3520a93bc2916dc1b35ff9ce35bdf76c5d9538b1.tar.gz
mpd-3520a93bc2916dc1b35ff9ce35bdf76c5d9538b1.tar.xz
mpd-3520a93bc2916dc1b35ff9ce35bdf76c5d9538b1.zip
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
-rw-r--r--src/playlist.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/playlist.c b/src/playlist.c
index 4d9c0da96..ba5b5150c 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -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();