From 3bceded79373a43ee75487a5bd037723c92e089b Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 19 Dec 2006 01:26:37 +0000 Subject: 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 --- apps/settings.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'apps/settings.h') 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 @@ #define TRIG_DURATION_COUNT 13 extern const char * const trig_durations[TRIG_DURATION_COUNT]; -#define CROSSFADE_ENABLE_SHUFFLE 1 -#define CROSSFADE_ENABLE_ALWAYS 2 +#define CROSSFADE_ENABLE_SHUFFLE 1 +#define CROSSFADE_ENABLE_TRACKSKIP 2 +#define CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP 3 +#define CROSSFADE_ENABLE_ALWAYS 4 #define FOLDER_ADVANCE_OFF 0 #define FOLDER_ADVANCE_NEXT 1 @@ -144,7 +146,7 @@ struct user_settings bool superbass; /* true/false */ #if CONFIG_CODEC == SWCODEC - int crossfade; /* Enable crossfade (0=off,1=shuffle,2=always) */ + int crossfade; /* Enable crossfade (0=off,1=shuffle,2=trackskip,3=shuff&trackskip,4=always) */ int crossfade_fade_in_delay; /* Fade in delay (0-15s) */ int crossfade_fade_out_delay; /* Fade out delay (0-15s) */ int crossfade_fade_in_duration; /* Fade in duration (0-15s) */ -- cgit v1.2.3