summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-05-15 13:30:01 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-05-15 13:30:01 +0000
commit5508d40d4bf582caaabb59ef1346b982948dcf2d (patch)
tree9b950c8a29af202f7cbcbe0fdf008f3338c62ffd
parent80d0d15ca9b253f8a446f50cf25d3d4b850bcfd1 (diff)
downloadrockbox-5508d40d4bf582caaabb59ef1346b982948dcf2d.zip
rockbox-5508d40d4bf582caaabb59ef1346b982948dcf2d.tar.gz
rockbox-5508d40d4bf582caaabb59ef1346b982948dcf2d.tar.bz2
rockbox-5508d40d4bf582caaabb59ef1346b982948dcf2d.tar.xz
Hopefully get some green back from r26051.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26052 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/menus/sound_menu.c2
-rw-r--r--firmware/drivers/audio/wm8731.c1
-rw-r--r--firmware/export/audiohw.h7
3 files changed, 7 insertions, 3 deletions
diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c
index 066b1da..e971553 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 e50079a..41c6757 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 12c4738..d7ee551 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 {