Add option to resume next track on automatic track change

Move autoresume setting into its own menu.  Add option to customize
which tracks should be resumed on automatic track change.  Tracks can
be selected based on their their file location or genre tag
(comma-separated list of filename / genre substrings).

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

1 files changed, 7 insertions, 2 deletions

diff --git a/apps/playback.c b/apps/playback.c
index e33a4ac507..fe7b74893a 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1002,8 +1002,13 @@ static void audio_update_trackinfo(void)
     thistrack_id3->elapsed = 0;
 
 #ifdef HAVE_TAGCACHE
-    /* Resume all manually selected tracks if so configured */
-    resume = global_settings.autoresume_enable && !automatic_skip;
+    /* Ignoring resume position for automatic track change if so configured */
+    resume = global_settings.autoresume_enable &&
+        (!automatic_skip     /* Resume all manually selected tracks */
+         || global_settings.autoresume_automatic == AUTORESUME_NEXTTRACK_ALWAYS
+         || (global_settings.autoresume_automatic != AUTORESUME_NEXTTRACK_NEVER
+                                                /* Not never resume? */
+             && autoresumable(thistrack_id3))); /* Pass Resume filter? */
 #endif
 
     if (!resume)