diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-08-07 00:56:39 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-08-07 00:56:39 +0000 |
commit | 40b09205fc0ea2d4e6514ec4b907532328563069 (patch) | |
tree | 78d49abf3ad5854c0ec7049f0d402acb55946768 /apps/settings.h | |
parent | c80f6dad303da248d7fe7d1acbe5916a06e3f73d (diff) | |
download | rockbox-40b09205fc0ea2d4e6514ec4b907532328563069.tar.gz rockbox-40b09205fc0ea2d4e6514ec4b907532328563069.zip |
Change a few defines to enums to match the other code around and argument bits #defines for settings_load to make clear it's bitwise.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22192 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.h')
-rw-r--r-- | apps/settings.h | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/apps/settings.h b/apps/settings.h index 3d05e29c64..ad6f225bad 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -83,12 +83,14 @@ struct opt_items { | |||
83 | #define MAX_FILENAME 32 | 83 | #define MAX_FILENAME 32 |
84 | 84 | ||
85 | 85 | ||
86 | #define BOOKMARK_NO 0 | 86 | enum { |
87 | #define BOOKMARK_YES 1 | 87 | BOOKMARK_NO, |
88 | #define BOOKMARK_ASK 2 | 88 | BOOKMARK_YES, |
89 | #define BOOKMARK_UNIQUE_ONLY 2 | 89 | BOOKMARK_ASK, |
90 | #define BOOKMARK_RECENT_ONLY_YES 3 | 90 | BOOKMARK_UNIQUE_ONLY, |
91 | #define BOOKMARK_RECENT_ONLY_ASK 4 | 91 | BOOKMARK_RECENT_ONLY_YES, |
92 | BOOKMARK_RECENT_ONLY_ASK, | ||
93 | }; | ||
92 | 94 | ||
93 | enum | 95 | enum |
94 | { | 96 | { |
@@ -104,14 +106,18 @@ enum | |||
104 | TRIG_TYPE_NEW_FILE | 106 | TRIG_TYPE_NEW_FILE |
105 | }; | 107 | }; |
106 | 108 | ||
107 | #define CROSSFADE_ENABLE_SHUFFLE 1 | 109 | enum { |
108 | #define CROSSFADE_ENABLE_TRACKSKIP 2 | 110 | CROSSFADE_ENABLE_SHUFFLE, |
109 | #define CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP 3 | 111 | CROSSFADE_ENABLE_TRACKSKIP, |
110 | #define CROSSFADE_ENABLE_ALWAYS 4 | 112 | CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP, |
113 | CROSSFADE_ENABLE_ALWAYS, | ||
114 | }; | ||
111 | 115 | ||
112 | #define FOLDER_ADVANCE_OFF 0 | 116 | enum { |
113 | #define FOLDER_ADVANCE_NEXT 1 | 117 | FOLDER_ADVANCE_OFF, |
114 | #define FOLDER_ADVANCE_RANDOM 2 | 118 | FOLDER_ADVANCE_NEXT, |
119 | FOLDER_ADVANCE_RANDOM, | ||
120 | } | ||
115 | 121 | ||
116 | /* repeat mode options */ | 122 | /* repeat mode options */ |
117 | enum | 123 | enum |
@@ -210,9 +216,9 @@ enum { ALARM_START_WPS = 0, | |||
210 | /** function prototypes **/ | 216 | /** function prototypes **/ |
211 | 217 | ||
212 | /* argument bits for settings_load() */ | 218 | /* argument bits for settings_load() */ |
213 | #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ | 219 | #define SETTINGS_RTC (BIT_N(0)) /* only the settings from the RTC nonvolatile RAM */ |
214 | #define SETTINGS_HD 2 /* only the settings from the disk sector */ | 220 | #define SETTINGS_HD (BIT_N(1)) /* only the settings from the disk sector */ |
215 | #define SETTINGS_ALL 3 /* both */ | 221 | #define SETTINGS_ALL (SETTINGS_RTC|SETTINGS_HD) /* both */ |
216 | void settings_load(int which); | 222 | void settings_load(int which); |
217 | bool settings_load_config(const char* file, bool apply); | 223 | bool settings_load_config(const char* file, bool apply); |
218 | 224 | ||