summaryrefslogtreecommitdiff
path: root/apps/settings_list.c
diff options
context:
space:
mode:
authorJeffrey Goode <jeffg7@gmail.com>2009-11-11 00:48:17 +0000
committerJeffrey Goode <jeffg7@gmail.com>2009-11-11 00:48:17 +0000
commit664dc90e714837bec83153daa13ef39769705c78 (patch)
tree99178673f1e2b40ee780adf1cdf1b2359bc8c106 /apps/settings_list.c
parent6db8f952dc3ea8ee315159e5de1d7bea4c9a6530 (diff)
Crossfade: added a new option, rewrote decision logic, updated manual and menus. Translators please note that updated translations may be required for some crossfade menu items!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23605 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r--apps/settings_list.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 9f290e2a18..1a9f7f2d6e 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1166,8 +1166,9 @@ const struct settings_list settings[] = {
/* crossfade */
CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0,
"crossfade",
- "off,shuffle,track skip,shuffle and track skip,always", NULL,
- 5, ID2P(LANG_OFF), ID2P(LANG_SHUFFLE), ID2P(LANG_TRACKSKIP),
+ "off,auto track skip,man track skip,shuffle,shuffle and man track skip,always",
+ NULL, 6, ID2P(LANG_OFF), ID2P(LANG_AUTOTRACKSKIP),
+ ID2P(LANG_MANTRACKSKIP), ID2P(LANG_SHUFFLE),
ID2P(LANG_SHUFFLE_TRACKSKIP), ID2P(LANG_ALWAYS)),
INT_SETTING(F_SOUNDSETTING, crossfade_fade_in_delay,
LANG_CROSSFADE_FADE_IN_DELAY, 0,