From 02c21b31b40cd27c5ab23725a8e3fbde1d0668ac Mon Sep 17 00:00:00 2001 From: jethead71 Date: Sat, 15 May 2010 13:30:01 +0000 Subject: [PATCH] Hopefully get some green back from r26051. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26052 a1c6a512-1295-4272-9138-f99709370657 --- apps/menus/sound_menu.c | 2 +- firmware/drivers/audio/wm8731.c | 1 - firmware/export/audiohw.h | 7 ++++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c index 066b1daba..e9715534c 100644 --- a/apps/menus/sound_menu.c +++ b/apps/menus/sound_menu.c @@ -49,7 +49,7 @@ MENUITEM_SETTING(bass, &global_settings.bass, ); #ifdef AUDIOHW_HAVE_BASS_CUTOFF -MENUITEM_SETTING(treble_cutoff, &global_settings.treble_cutoff, NULL); +MENUITEM_SETTING(bass_cutoff, &global_settings.bass_cutoff, NULL); #endif #endif /* AUDIOHW_HAVE_BASS */ diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c index e50079a18..41c675752 100644 --- a/firmware/drivers/audio/wm8731.c +++ b/firmware/drivers/audio/wm8731.c @@ -35,7 +35,6 @@ #include "audio.h" #include "wmcodec.h" -#include "audiohw.h" #include "sound.h" diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 12c4738f7..d7ee551e4 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h @@ -225,7 +225,12 @@ enum AUDIOHW_EQ_SETTINGS #if (AUDIOHW_CAPS & DEPTH_3D_CAP) #define AUDIOHW_HAVE_DEPTH_3D #endif - +#else +#if defined (HAVE_SW_TONE_CONTROLS) +/* Needed for proper sound support */ +#define AUDIOHW_HAVE_BASS +#define AUDIOHW_HAVE_TREBLE +#endif #endif /* AUDIOHW_CAPS */ enum { -- 2.11.4.GIT