summaryrefslogtreecommitdiff
path: root/apps/sound_menu.c
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2005-12-05 22:35:18 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2005-12-05 22:35:18 +0000
commit5c3546ccbb14b576fd5eef3815bdfc97047de422 (patch)
tree2ad5d0d7991d47eeb1a504804f16b2a3c6fbbaf7 /apps/sound_menu.c
parent3776a844ac14f1c389e81fe1ed65bc9526f3abad (diff)
downloadrockbox-5c3546ccbb14b576fd5eef3815bdfc97047de422.tar.gz
rockbox-5c3546ccbb14b576fd5eef3815bdfc97047de422.zip
moved crossfeed from the Playback menu to Sound Settings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8161 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/sound_menu.c')
-rw-r--r--apps/sound_menu.c20
1 files changed, 20 insertions, 0 deletions
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 @@
43#include "mas.h" 43#include "mas.h"
44#endif 44#endif
45#include "splash.h" 45#include "splash.h"
46#if CONFIG_CODEC == SWCODEC
47#include "dsp.h"
48#endif
46 49
47int selected_setting; /* Used by the callback */ 50int selected_setting; /* Used by the callback */
48void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit) 51void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit)
@@ -102,6 +105,20 @@ static bool treble(void)
102 return set_sound(str(LANG_TREBLE), &global_settings.treble, SOUND_TREBLE); 105 return set_sound(str(LANG_TREBLE), &global_settings.treble, SOUND_TREBLE);
103} 106}
104 107
108#if CONFIG_CODEC == SWCODEC
109static bool crossfeed(void)
110{
111 bool result = set_bool_options(str(LANG_CROSSFEED),
112 &global_settings.crossfeed,
113 STR(LANG_ON),
114 STR(LANG_OFF),
115 NULL);
116
117 dsp_set_crossfeed(global_settings.crossfeed);
118 return result;
119}
120#endif
121
105#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 122#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
106static bool loudness(void) 123static bool loudness(void)
107{ 124{
@@ -375,6 +392,9 @@ bool sound_menu(void)
375 { ID2P(LANG_BALANCE), balance }, 392 { ID2P(LANG_BALANCE), balance },
376 { ID2P(LANG_CHANNEL_MENU), chanconf }, 393 { ID2P(LANG_CHANNEL_MENU), chanconf },
377 { ID2P(LANG_STEREO_WIDTH), stereo_width }, 394 { ID2P(LANG_STEREO_WIDTH), stereo_width },
395#if CONFIG_CODEC == SWCODEC
396 { ID2P(LANG_CROSSFEED), crossfeed },
397#endif
378#ifdef HAVE_UDA1380 398#ifdef HAVE_UDA1380
379 { ID2P(LANG_SCALING_MODE), sound_scaling }, 399 { ID2P(LANG_SCALING_MODE), sound_scaling },
380#endif 400#endif