moved crossfeed from the Playback menu to Sound Settings

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8161 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 20 insertions, 13 deletions

diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 88b246fec4..ca352fd8ff 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 06887cf9d3..af1a2fdfee 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