diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-22 16:46:27 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-22 16:46:27 +0000 |
| commit | 90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0 (patch) | |
| tree | ac53454c122465d174ec6a47a56e72505d7b09b8 /apps/settings_menu.c | |
| parent | 4f6375ca175b34623e5c737cd36dbd62aad58fd2 (diff) | |
| download | rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.zip rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.gz rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.bz2 rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.xz | |
It's now possible to select the crossfading mode: "Off, Crossfade,
Mix". If set to mix, no fading is applied but tracks are mixed up.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7224 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_menu.c')
| -rw-r--r-- | apps/settings_menu.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index df5f4a4..5b03a8d 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -1131,6 +1131,22 @@ static bool crossfade(void) { static const struct opt_items names[] = { { STR(LANG_OFF) }, + { STR(LANG_CROSSFADE) }, + { STR(LANG_MIX) }, + }; + bool ret; + + ret = set_option( str(LANG_CROSSFADE), + &global_settings.crossfade, INT, names, 3, NULL); + audio_set_crossfade(global_settings.crossfade); + + return ret; +} + +static bool crossfade_duration(void) +{ + static const struct opt_items names[] = { + { "1s", TALK_ID(1, UNIT_SEC) }, { "2s", TALK_ID(2, UNIT_SEC) }, { "4s", TALK_ID(4, UNIT_SEC) }, { "6s", TALK_ID(6, UNIT_SEC) }, @@ -1140,13 +1156,12 @@ static bool crossfade(void) { "14s", TALK_ID(14, UNIT_SEC) }, }; bool ret; - ret=set_option( str(LANG_CROSSFADE), &global_settings.crossfade, - INT, names, 8, NULL); - audio_set_crossfade_amount(global_settings.crossfade); + ret=set_option( str(LANG_CROSSFADE_DURATION), + &global_settings.crossfade_duration, INT, names, 8, NULL); + audio_set_crossfade(global_settings.crossfade); return ret; } - #endif static bool next_folder(void) @@ -1187,6 +1202,7 @@ static bool playback_settings_menu(void) { ID2P(LANG_FADE_ON_STOP), set_fade_on_stop }, #if CONFIG_HWCODEC == MASNONE { ID2P(LANG_CROSSFADE), crossfade }, + { ID2P(LANG_CROSSFADE_DURATION), crossfade_duration }, #endif #ifdef HAVE_SPDIF_POWER { ID2P(LANG_SPDIF_ENABLE), spdif }, |