devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

It's now possible to select the crossfading mode: "Off, Crossfade,

Browse source 
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
This commit is contained in:
Miika Pekkarinen 2005-07-22 16:46:27 +00:00
parent 4f6375ca17
commit 90161c92dd
9 changed files with 82 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/settings_menu.c
View file

@ -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 },