summaryrefslogtreecommitdiffstats
path: root/apps/settings.h
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2018-10-30 09:43:32 -0400
committerSolomon Peachy <pizza@shaftnet.org>2018-12-14 14:03:12 +0100
commitbea9cf7b1ee2eb87f1067e1cfafa3c627a982cf5 (patch)
treecaa6f67f608c86ba9a667218a0a2872f0b3156e3 /apps/settings.h
parent6f020ef155de094fd2cdf30ed8258e7fed07a2e8 (diff)
downloadrockbox-bea9cf7b1ee2eb87f1067e1cfafa3c627a982cf5.tar.gz
rockbox-bea9cf7b1ee2eb87f1067e1cfafa3c627a982cf5.tar.bz2
rockbox-bea9cf7b1ee2eb87f1067e1cfafa3c627a982cf5.zip
FS11473: Add bookmarking option: one per track.
Modified version from ticket, taken from Igor Poretsky's tree, and further modified to incorporate feedback. Change-Id: I9284497d53a0247a51739d29fdc1db5fbbebfadc
Diffstat (limited to 'apps/settings.h')
-rw-r--r--apps/settings.h25
1 files changed, 19 insertions, 6 deletions
diff --git a/apps/settings.h b/apps/settings.h
index cbe12d70b7..db16e717e6 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -45,14 +45,26 @@ struct opt_items {
#define MAX_FILENAME 32
#define MAX_PATHNAME 80
+/* The values are assigned to the enums so that they correspond to */
+/* setting values in settings_list.c */
+/* Shared by all bookmark parameters */
enum {
BOOKMARK_NO = 0,
- BOOKMARK_YES,
- BOOKMARK_ASK,
- BOOKMARK_UNIQUE_ONLY = 2,
- BOOKMARK_RECENT_ONLY_YES,
- BOOKMARK_RECENT_ONLY_ASK,
+ BOOKMARK_YES = 1,
+};
+
+/* Auto create bookmark */
+enum {
+ BOOKMARK_ASK = 2,
+ BOOKMARK_RECENT_ONLY_YES = 3,
+ BOOKMARK_RECENT_ONLY_ASK = 4,
+};
+
+/* Most recent bookmark */
+enum {
+ BOOKMARK_ONE_PER_PLAYLIST = 2,
+ BOOKMARK_ONE_PER_TRACK = 3,
};
enum
@@ -557,7 +569,8 @@ struct user_settings
int autoloadbookmark; /* auto load option: 0=off, 1=ask, 2=on */
int autocreatebookmark; /* auto create option: 0=off, 1=ask, 2=on */
bool autoupdatebookmark;/* auto update option */
- int usemrb; /* use MRB list: 0=No, 1=Yes, 2=One per playlist */
+ int usemrb; /* use MRB list: 0=No, 1=Yes, 2=One per playlist,
+ 3=One per playlist and track */
#ifdef HAVE_DIRCACHE
bool dircache; /* enable directory cache */