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.c | |
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.c')
-rw-r--r-- | apps/settings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/settings.c b/apps/settings.c index 454ba183ee..d4359fda79 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -100,7 +100,7 @@ const char rec_base_directory[] = REC_BASE_DIR; | |||
100 | #include "eq_menu.h" | 100 | #include "eq_menu.h" |
101 | #endif | 101 | #endif |
102 | 102 | ||
103 | #define CONFIG_BLOCK_VERSION 57 | 103 | #define CONFIG_BLOCK_VERSION 58 |
104 | #define CONFIG_BLOCK_SIZE 512 | 104 | #define CONFIG_BLOCK_SIZE 512 |
105 | #define RTC_BLOCK_SIZE 44 | 105 | #define RTC_BLOCK_SIZE 44 |
106 | 106 | ||
@@ -581,7 +581,7 @@ static const struct bit_entry hd_bits[] = | |||
581 | {1, S_O(replaygain_noclip), false, "replaygain noclip", off_on }, | 581 | {1, S_O(replaygain_noclip), false, "replaygain noclip", off_on }, |
582 | {8 | SIGNED, S_O(replaygain_preamp), 0, "replaygain preamp", NULL }, | 582 | {8 | SIGNED, S_O(replaygain_preamp), 0, "replaygain preamp", NULL }, |
583 | {2, S_O(beep), 0, "beep", "off,weak,moderate,strong" }, | 583 | {2, S_O(beep), 0, "beep", "off,weak,moderate,strong" }, |
584 | {2, S_O(crossfade), 0, "crossfade", "off,shuffle,track skip,always"}, | 584 | {3, S_O(crossfade), 0, "crossfade", "off,shuffle,track skip,shuffle and track skip,always"}, |
585 | {3, S_O(crossfade_fade_in_delay), 0, "crossfade fade in delay", NULL}, | 585 | {3, S_O(crossfade_fade_in_delay), 0, "crossfade fade in delay", NULL}, |
586 | {3, S_O(crossfade_fade_out_delay), 0, "crossfade fade out delay", NULL}, | 586 | {3, S_O(crossfade_fade_out_delay), 0, "crossfade fade out delay", NULL}, |
587 | {4, S_O(crossfade_fade_in_duration), 0, "crossfade fade in duration", NULL}, | 587 | {4, S_O(crossfade_fade_in_duration), 0, "crossfade fade in duration", NULL}, |