diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-12-19 01:26:37 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-12-19 01:26:37 +0000 |
commit | 3bceded79373a43ee75487a5bd037723c92e089b (patch) | |
tree | 4c75cadc06d82818321318bc4b59aa385892b475 /apps/settings.h | |
parent | 89990b0ca851b88988531137127a3bbeea7aa717 (diff) | |
download | rockbox-3bceded79373a43ee75487a5bd037723c92e089b.tar.gz rockbox-3bceded79373a43ee75487a5bd037723c92e089b.zip |
Accept FS#5344 by Mike Schmitt. Add a "shuffle and track skip" option to
crossfade.
Bumps config versino, so SAVE SETTINGS before updating.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11811 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.h')
-rw-r--r-- | apps/settings.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/settings.h b/apps/settings.h index cb57c1ac77..b5c673faa0 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -87,8 +87,10 @@ | |||
87 | #define TRIG_DURATION_COUNT 13 | 87 | #define TRIG_DURATION_COUNT 13 |
88 | extern const char * const trig_durations[TRIG_DURATION_COUNT]; | 88 | extern const char * const trig_durations[TRIG_DURATION_COUNT]; |
89 | 89 | ||
90 | #define CROSSFADE_ENABLE_SHUFFLE 1 | 90 | #define CROSSFADE_ENABLE_SHUFFLE 1 |
91 | #define CROSSFADE_ENABLE_ALWAYS 2 | 91 | #define CROSSFADE_ENABLE_TRACKSKIP 2 |
92 | #define CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP 3 | ||
93 | #define CROSSFADE_ENABLE_ALWAYS 4 | ||
92 | 94 | ||
93 | #define FOLDER_ADVANCE_OFF 0 | 95 | #define FOLDER_ADVANCE_OFF 0 |
94 | #define FOLDER_ADVANCE_NEXT 1 | 96 | #define FOLDER_ADVANCE_NEXT 1 |
@@ -144,7 +146,7 @@ struct user_settings | |||
144 | bool superbass; /* true/false */ | 146 | bool superbass; /* true/false */ |
145 | 147 | ||
146 | #if CONFIG_CODEC == SWCODEC | 148 | #if CONFIG_CODEC == SWCODEC |
147 | int crossfade; /* Enable crossfade (0=off,1=shuffle,2=always) */ | 149 | int crossfade; /* Enable crossfade (0=off,1=shuffle,2=trackskip,3=shuff&trackskip,4=always) */ |
148 | int crossfade_fade_in_delay; /* Fade in delay (0-15s) */ | 150 | int crossfade_fade_in_delay; /* Fade in delay (0-15s) */ |
149 | int crossfade_fade_out_delay; /* Fade out delay (0-15s) */ | 151 | int crossfade_fade_out_delay; /* Fade out delay (0-15s) */ |
150 | int crossfade_fade_in_duration; /* Fade in duration (0-15s) */ | 152 | int crossfade_fade_in_duration; /* Fade in duration (0-15s) */ |