Repeat off/all/one toggle. By Hardeep Sidhu.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2498 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 33 insertions, 14 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index b81aed8763..038e710829 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -66,15 +66,37 @@ int playlist_add(char *filename)
     return 0;
 }
 
-int playlist_next(int steps)
+static int get_next_index(int steps)
 {
-    playlist.index = (playlist.index+steps) % playlist.amount;
-    while ( playlist.index < 0 ) {
-        if ( global_settings.loop_playlist )
-            playlist.index += playlist.amount;
-        else
-            playlist.index = 0;
+    int next_index = -1;
+
+    switch (global_settings.repeat_mode)
+    {
+        case REPEAT_OFF:
+            next_index = playlist.index+steps;
+            if ((next_index < 0) || (next_index >= playlist.amount))
+                next_index = -1;
+            break;
+
+        case REPEAT_ONE:
+            next_index = playlist.index;
+            break;
+
+        case REPEAT_ALL:
+        default:
+            next_index = (playlist.index+steps) % playlist.amount;
+            while (next_index < 0)
+                next_index += playlist.amount;
+            break;
     }
+
+    return next_index;
+}
+
+int playlist_next(int steps)
+{
+    playlist.index = get_next_index(steps);
+
     return playlist.index;
 }
 
@@ -93,14 +115,11 @@ char* playlist_peek(int steps)
         /* prevent madness when all files are empty/bad */
         return NULL;
 
-    index = (playlist.index+steps) % playlist.amount;
-    while ( index < 0 ) {
-        if ( global_settings.loop_playlist )
-            index += playlist.amount;
-        else
-            index = 0;
-    }
+    index = get_next_index(steps);
+    if (index >= 0)
     seek = playlist.indices[index];
+    else
+        return NULL;
 
     if(playlist.in_ram)
     {