Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moved crossfeed from the Playback menu to Sound Settings

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8161 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcoen Hirschberg 2005-12-05 22:35:18 +00:00
parent 3776a844ac
commit 5c3546ccbb
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/settings_menu.c
View file

@ -1221,18 +1221,6 @@ static bool replaygain_settings_menu(void)
return result; 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 bool crossfade(void)
{ {
static const struct opt_items names[] = { static const struct opt_items names[] = {
@ -1384,7 +1372,6 @@ static bool playback_settings_menu(void)
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
{ ID2P(LANG_CROSSFADE), crossfade_settings_menu }, { ID2P(LANG_CROSSFADE), crossfade_settings_menu },
{ ID2P(LANG_REPLAYGAIN), replaygain_settings_menu }, { ID2P(LANG_REPLAYGAIN), replaygain_settings_menu },
{ ID2P(LANG_CROSSFEED), crossfeed },
{ ID2P(LANG_BEEP), beep }, { ID2P(LANG_BEEP), beep },
#endif #endif
#ifdef HAVE_SPDIF_POWER #ifdef HAVE_SPDIF_POWER

20
apps/sound_menu.c
View file

@ -43,6 +43,9 @@
#include "mas.h" #include "mas.h"
#endif #endif
#include "splash.h" #include "splash.h"
#if CONFIG_CODEC == SWCODEC
#include "dsp.h"
#endif
int selected_setting; /* Used by the callback */ int selected_setting; /* Used by the callback */
void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit) 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); 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) #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
static bool loudness(void) static bool loudness(void)
{ {
@ -375,6 +392,9 @@ bool sound_menu(void)
{ ID2P(LANG_BALANCE), balance }, { ID2P(LANG_BALANCE), balance },
{ ID2P(LANG_CHANNEL_MENU), chanconf }, { ID2P(LANG_CHANNEL_MENU), chanconf },
{ ID2P(LANG_STEREO_WIDTH), stereo_width }, { ID2P(LANG_STEREO_WIDTH), stereo_width },
#if CONFIG_CODEC == SWCODEC
{ ID2P(LANG_CROSSFEED), crossfeed },
#endif
#ifdef HAVE_UDA1380 #ifdef HAVE_UDA1380
{ ID2P(LANG_SCALING_MODE), sound_scaling }, { ID2P(LANG_SCALING_MODE), sound_scaling },
#endif #endif