diff options
| author | Marcoen Hirschberg <marcoen@gmail.com> | 2005-12-05 22:35:18 +0000 |
|---|---|---|
| committer | Marcoen Hirschberg <marcoen@gmail.com> | 2005-12-05 22:35:18 +0000 |
| commit | 5c3546ccbb14b576fd5eef3815bdfc97047de422 (patch) | |
| tree | 2ad5d0d7991d47eeb1a504804f16b2a3c6fbbaf7 | |
| parent | 3776a844ac14f1c389e81fe1ed65bc9526f3abad (diff) | |
| download | rockbox-5c3546ccbb14b576fd5eef3815bdfc97047de422.zip rockbox-5c3546ccbb14b576fd5eef3815bdfc97047de422.tar.gz rockbox-5c3546ccbb14b576fd5eef3815bdfc97047de422.tar.bz2 rockbox-5c3546ccbb14b576fd5eef3815bdfc97047de422.tar.xz | |
moved crossfeed from the Playback menu to Sound Settings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8161 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/settings_menu.c | 13 | ||||
| -rw-r--r-- | apps/sound_menu.c | 20 |
2 files changed, 20 insertions, 13 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 88b246f..ca352fd 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -1221,18 +1221,6 @@ static bool replaygain_settings_menu(void) return result; } -static bool crossfeed(void) -{ - bool result = set_bool_options(str(LANG_CROSSFEED), - &global_settings.crossfeed, - STR(LANG_ON), - STR(LANG_OFF), - NULL); - - dsp_set_crossfeed(global_settings.crossfeed); - return result; -} - static bool crossfade(void) { static const struct opt_items names[] = { @@ -1384,7 +1372,6 @@ static bool playback_settings_menu(void) #if CONFIG_CODEC == SWCODEC { ID2P(LANG_CROSSFADE), crossfade_settings_menu }, { ID2P(LANG_REPLAYGAIN), replaygain_settings_menu }, - { ID2P(LANG_CROSSFEED), crossfeed }, { ID2P(LANG_BEEP), beep }, #endif #ifdef HAVE_SPDIF_POWER diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 06887cf..af1a2fd 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c @@ -43,6 +43,9 @@ #include "mas.h" #endif #include "splash.h" +#if CONFIG_CODEC == SWCODEC +#include "dsp.h" +#endif int selected_setting; /* Used by the callback */ void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit) @@ -102,6 +105,20 @@ static bool treble(void) return set_sound(str(LANG_TREBLE), &global_settings.treble, SOUND_TREBLE); } +#if CONFIG_CODEC == SWCODEC +static bool crossfeed(void) +{ + bool result = set_bool_options(str(LANG_CROSSFEED), + &global_settings.crossfeed, + STR(LANG_ON), + STR(LANG_OFF), + NULL); + + dsp_set_crossfeed(global_settings.crossfeed); + return result; +} +#endif + #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) static bool loudness(void) { @@ -375,6 +392,9 @@ bool sound_menu(void) { ID2P(LANG_BALANCE), balance }, { ID2P(LANG_CHANNEL_MENU), chanconf }, { ID2P(LANG_STEREO_WIDTH), stereo_width }, +#if CONFIG_CODEC == SWCODEC + { ID2P(LANG_CROSSFEED), crossfeed }, +#endif #ifdef HAVE_UDA1380 { ID2P(LANG_SCALING_MODE), sound_scaling }, #endif |