Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22192 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-08-07 00:56:39 +00:00
parent c80f6dad30
commit 40b09205fc
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/settings.h
View file

@ -83,12 +83,14 @@ struct opt_items {
#define MAX_FILENAME 32 #define MAX_FILENAME 32
#define BOOKMARK_NO 0 enum {
#define BOOKMARK_YES 1 BOOKMARK_NO,
#define BOOKMARK_ASK 2 BOOKMARK_YES,
#define BOOKMARK_UNIQUE_ONLY 2 BOOKMARK_ASK,
#define BOOKMARK_RECENT_ONLY_YES 3 BOOKMARK_UNIQUE_ONLY,
#define BOOKMARK_RECENT_ONLY_ASK 4 BOOKMARK_RECENT_ONLY_YES,
BOOKMARK_RECENT_ONLY_ASK,
};
enum enum
{ {
@ -104,14 +106,18 @@ enum
TRIG_TYPE_NEW_FILE TRIG_TYPE_NEW_FILE
}; };
#define CROSSFADE_ENABLE_SHUFFLE 1 enum {
#define CROSSFADE_ENABLE_TRACKSKIP 2 CROSSFADE_ENABLE_SHUFFLE,
#define CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP 3 CROSSFADE_ENABLE_TRACKSKIP,
#define CROSSFADE_ENABLE_ALWAYS 4 CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP,
CROSSFADE_ENABLE_ALWAYS,
};
#define FOLDER_ADVANCE_OFF 0 enum {
#define FOLDER_ADVANCE_NEXT 1 FOLDER_ADVANCE_OFF,
#define FOLDER_ADVANCE_RANDOM 2 FOLDER_ADVANCE_NEXT,
FOLDER_ADVANCE_RANDOM,
}
/* repeat mode options */ /* repeat mode options */
enum enum
@ -210,9 +216,9 @@ enum { ALARM_START_WPS = 0,
/** function prototypes **/ /** function prototypes **/
/* argument bits for settings_load() */ /* argument bits for settings_load() */
#define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ #define SETTINGS_RTC (BIT_N(0)) /* only the settings from the RTC nonvolatile RAM */
#define SETTINGS_HD 2 /* only the settings from the disk sector */ #define SETTINGS_HD (BIT_N(1)) /* only the settings from the disk sector */
#define SETTINGS_ALL 3 /* both */ #define SETTINGS_ALL (SETTINGS_RTC|SETTINGS_HD) /* both */
void settings_load(int which); void settings_load(int which);
bool settings_load_config(const char* file, bool apply); bool settings_load_config(const char* file, bool apply);