diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2018-10-30 09:43:32 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2018-12-14 14:03:12 +0100 |
commit | bea9cf7b1ee2eb87f1067e1cfafa3c627a982cf5 (patch) | |
tree | caa6f67f608c86ba9a667218a0a2872f0b3156e3 /apps/settings.h | |
parent | 6f020ef155de094fd2cdf30ed8258e7fed07a2e8 (diff) | |
download | rockbox-bea9cf7b1ee2eb87f1067e1cfafa3c627a982cf5.tar.gz 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.h | 25 |
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 { | |||
45 | #define MAX_FILENAME 32 | 45 | #define MAX_FILENAME 32 |
46 | #define MAX_PATHNAME 80 | 46 | #define MAX_PATHNAME 80 |
47 | 47 | ||
48 | /* The values are assigned to the enums so that they correspond to */ | ||
49 | /* setting values in settings_list.c */ | ||
48 | 50 | ||
51 | /* Shared by all bookmark parameters */ | ||
49 | enum { | 52 | enum { |
50 | BOOKMARK_NO = 0, | 53 | BOOKMARK_NO = 0, |
51 | BOOKMARK_YES, | 54 | BOOKMARK_YES = 1, |
52 | BOOKMARK_ASK, | 55 | }; |
53 | BOOKMARK_UNIQUE_ONLY = 2, | 56 | |
54 | BOOKMARK_RECENT_ONLY_YES, | 57 | /* Auto create bookmark */ |
55 | BOOKMARK_RECENT_ONLY_ASK, | 58 | enum { |
59 | BOOKMARK_ASK = 2, | ||
60 | BOOKMARK_RECENT_ONLY_YES = 3, | ||
61 | BOOKMARK_RECENT_ONLY_ASK = 4, | ||
62 | }; | ||
63 | |||
64 | /* Most recent bookmark */ | ||
65 | enum { | ||
66 | BOOKMARK_ONE_PER_PLAYLIST = 2, | ||
67 | BOOKMARK_ONE_PER_TRACK = 3, | ||
56 | }; | 68 | }; |
57 | 69 | ||
58 | enum | 70 | enum |
@@ -557,7 +569,8 @@ struct user_settings | |||
557 | int autoloadbookmark; /* auto load option: 0=off, 1=ask, 2=on */ | 569 | int autoloadbookmark; /* auto load option: 0=off, 1=ask, 2=on */ |
558 | int autocreatebookmark; /* auto create option: 0=off, 1=ask, 2=on */ | 570 | int autocreatebookmark; /* auto create option: 0=off, 1=ask, 2=on */ |
559 | bool autoupdatebookmark;/* auto update option */ | 571 | bool autoupdatebookmark;/* auto update option */ |
560 | int usemrb; /* use MRB list: 0=No, 1=Yes, 2=One per playlist */ | 572 | int usemrb; /* use MRB list: 0=No, 1=Yes, 2=One per playlist, |
573 | 3=One per playlist and track */ | ||
561 | 574 | ||
562 | #ifdef HAVE_DIRCACHE | 575 | #ifdef HAVE_DIRCACHE |
563 | bool dircache; /* enable directory cache */ | 576 | bool dircache; /* enable directory cache */ |