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_menu.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_menu.c')
-rw-r--r-- | apps/settings_menu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 892d9d2b2c..e49a9ec2c9 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1514,13 +1514,14 @@ static bool crossfade(void) | |||
1514 | { STR(LANG_OFF) }, | 1514 | { STR(LANG_OFF) }, |
1515 | { STR(LANG_SHUFFLE) }, | 1515 | { STR(LANG_SHUFFLE) }, |
1516 | { STR(LANG_TRACKSKIP) }, | 1516 | { STR(LANG_TRACKSKIP) }, |
1517 | { STR(LANG_SHUFFLE_TRACKSKIP) }, | ||
1517 | { STR(LANG_ALWAYS) }, | 1518 | { STR(LANG_ALWAYS) }, |
1518 | }; | 1519 | }; |
1519 | 1520 | ||
1520 | bool ret; | 1521 | bool ret; |
1521 | 1522 | ||
1522 | ret=set_option( str(LANG_CROSSFADE_ENABLE), | 1523 | ret=set_option( str(LANG_CROSSFADE_ENABLE), |
1523 | &global_settings.crossfade, INT, names, 4, NULL); | 1524 | &global_settings.crossfade, INT, names, 5, NULL); |
1524 | audio_set_crossfade(global_settings.crossfade); | 1525 | audio_set_crossfade(global_settings.crossfade); |
1525 | return ret; | 1526 | return ret; |
1526 | } | 1527 | } |