Resume rework. With the new resume function, 'Ask' and 'Ask Once' are redundant options, since you can resume after any startup using the resume key. These have been stripped out, and the resume code has been streamlined. A small bug in button handler initialisation has been fixed.

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

1 files changed, 1 insertions, 6 deletions

diff --git a/apps/settings.h b/apps/settings.h
index bb4f5fbf32..d630db7f35 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -78,11 +78,6 @@
 
 /* data structures */
 
-#define RESUME_OFF 0
-#define RESUME_ASK 1
-#define RESUME_ASK_ONCE 2
-#define RESUME_ON  3
-
 #define BOOKMARK_NO  0
 #define BOOKMARK_YES 1
 #define BOOKMARK_ASK 2
@@ -211,7 +206,7 @@ struct user_settings
 
     /* resume settings */
 
-    int resume;        /* resume option: 0=off, 1=ask, 2=on */
+    bool resume;        /* resume option: 0=off, 1=on */
     int resume_index;  /* index in playlist (-1 for no active resume) */
     int resume_first_index;  /* index of first track in playlist */
     int resume_offset; /* byte offset in mp3 file */