diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/settings.c b/apps/settings.c index 870376c8b2..5eb434b31d 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -85,7 +85,7 @@ const char rec_base_directory[] = REC_BASE_DIR; | |||
85 | #include "dsp.h" | 85 | #include "dsp.h" |
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | #define CONFIG_BLOCK_VERSION 28 | 88 | #define CONFIG_BLOCK_VERSION 29 |
89 | #define CONFIG_BLOCK_SIZE 512 | 89 | #define CONFIG_BLOCK_SIZE 512 |
90 | #define RTC_BLOCK_SIZE 44 | 90 | #define RTC_BLOCK_SIZE 44 |
91 | 91 | ||
@@ -417,10 +417,6 @@ static const struct bit_entry hd_bits[] = | |||
417 | {4, S_O(rec_trigger_mode ), 0, "trigger mode", "off,once,repeat"}, | 417 | {4, S_O(rec_trigger_mode ), 0, "trigger mode", "off,once,repeat"}, |
418 | #endif | 418 | #endif |
419 | 419 | ||
420 | #if CONFIG_CODEC == SWCODEC | ||
421 | {3, S_O(crossfade_duration), 0, "crossfade duration", "1s,2s,4s,6s,8s,10s,12s,14s"}, | ||
422 | #endif | ||
423 | |||
424 | #if CONFIG_BACKLIGHT == BL_IRIVER | 420 | #if CONFIG_BACKLIGHT == BL_IRIVER |
425 | /* backlight fading */ | 421 | /* backlight fading */ |
426 | {2, S_O(backlight_fade_in), 1, "backlight fade in", "off,500ms,1s,2s"}, | 422 | {2, S_O(backlight_fade_in), 1, "backlight fade in", "off,500ms,1s,2s"}, |
@@ -436,13 +432,18 @@ static const struct bit_entry hd_bits[] = | |||
436 | {1, S_O(runtimedb), false, "gather runtime data", off_on }, | 432 | {1, S_O(runtimedb), false, "gather runtime data", off_on }, |
437 | 433 | ||
438 | #if CONFIG_CODEC == SWCODEC | 434 | #if CONFIG_CODEC == SWCODEC |
439 | {2, S_O(crossfade), 0, "crossfade type", "off,crossfade,mix"}, | ||
440 | {1, S_O(replaygain), false, "replaygain", off_on }, | 435 | {1, S_O(replaygain), false, "replaygain", off_on }, |
441 | {2, S_O(replaygain_type), REPLAYGAIN_ALBUM, "replaygain type", | 436 | {2, S_O(replaygain_type), REPLAYGAIN_ALBUM, "replaygain type", |
442 | "track,album,track shuffle" }, | 437 | "track,album,track shuffle" }, |
443 | {1, S_O(replaygain_noclip), false, "replaygain noclip", off_on }, | 438 | {1, S_O(replaygain_noclip), false, "replaygain noclip", off_on }, |
444 | {8 | SIGNED, S_O(replaygain_preamp), 0, "replaygain preamp", NULL }, | 439 | {8 | SIGNED, S_O(replaygain_preamp), 0, "replaygain preamp", NULL }, |
445 | {2, S_O(beep), 0, "beep", "off,weak,moderate,strong" }, | 440 | {2, S_O(beep), 0, "beep", "off,weak,moderate,strong" }, |
441 | {2, S_O(crossfade), 0, "crossfade", "off,shuffle,always"}, | ||
442 | {3, S_O(crossfade_fade_in_delay), 0, "crossfade fade in delay", NULL}, | ||
443 | {3, S_O(crossfade_fade_out_delay), 0, "crossfade fade out delay", NULL}, | ||
444 | {4, S_O(crossfade_fade_in_duration), 0, "crossfade fade in duration", NULL}, | ||
445 | {4, S_O(crossfade_fade_out_duration), 0, "crossfade fade out duration", NULL}, | ||
446 | {1, S_O(crossfade_fade_out_mixmode), 0, "crossfade fade out mode", "crossfade,mix"}, | ||
446 | #endif | 447 | #endif |
447 | #ifdef HAVE_DIRCACHE | 448 | #ifdef HAVE_DIRCACHE |
448 | {1, S_O(dircache), false, "dircache", off_on }, | 449 | {1, S_O(dircache), false, "dircache", off_on }, |