diff options
| author | Dan Everton <dan@iocaine.org> | 2006-08-15 10:21:32 +0000 |
|---|---|---|
| committer | Dan Everton <dan@iocaine.org> | 2006-08-15 10:21:32 +0000 |
| commit | aa38ce54bb06cb0c1f97fc9d0feddf65bc99a326 (patch) | |
| tree | 405f190dbca74c9696cab554ca85c75d2bbd3432 | |
| parent | eb1dd38960214cb5581b9d39ef4fe73e2a050090 (diff) | |
| download | rockbox-aa38ce54bb06cb0c1f97fc9d0feddf65bc99a326.tar.gz rockbox-aa38ce54bb06cb0c1f97fc9d0feddf65bc99a326.zip | |
Move Hardware Equalizer menu up a level so it's no longer a sub-menu of the software equalizer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10579 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/eq_menu.c | 5 | ||||
| -rw-r--r-- | apps/eq_menu.h | 4 | ||||
| -rw-r--r-- | apps/sound_menu.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/apps/eq_menu.c b/apps/eq_menu.c index b863e45926..32d16c47e1 100644 --- a/apps/eq_menu.c +++ b/apps/eq_menu.c @@ -1223,7 +1223,7 @@ static bool eq_hw_set_band4(void) return result; } -static bool eq_hw_menu(void) +bool eq_hw_menu(void) { int m; bool result; @@ -1256,9 +1256,6 @@ bool eq_menu(void) { ID2P(LANG_EQUALIZER_PRECUT), eq_precut }, { ID2P(LANG_EQUALIZER_GAIN), eq_gain_menu }, { ID2P(LANG_EQUALIZER_ADVANCED), eq_advanced_menu }, -#ifdef HAVE_WM8758 - { ID2P(LANG_EQUALIZER_HARDWARE), eq_hw_menu }, -#endif { ID2P(LANG_EQUALIZER_SAVE), eq_save_preset }, { ID2P(LANG_EQUALIZER_BROWSE), eq_browse_presets }, }; diff --git a/apps/eq_menu.h b/apps/eq_menu.h index a22c1e51b8..928a97238a 100644 --- a/apps/eq_menu.h +++ b/apps/eq_menu.h @@ -20,9 +20,13 @@ #define _EQ_MENU_H #include "menu.h" +#include "config.h" bool eq_browse_presets(void); bool eq_menu_graphical(void); bool eq_menu(void); +#ifdef HAVE_WM8758 +bool eq_hw_menu(void); +#endif #endif diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 087ef4bd09..280fe52169 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c @@ -560,6 +560,9 @@ bool sound_menu(void) { ID2P(LANG_CROSSFEED), crossfeed_menu }, { ID2P(LANG_EQUALIZER), eq_menu }, #endif +#ifdef HAVE_WM8758 + { ID2P(LANG_EQUALIZER_HARDWARE), eq_hw_menu }, +#endif #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) { ID2P(LANG_LOUDNESS), loudness }, { ID2P(LANG_AUTOVOL), avc }, |