diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2010-05-15 14:16:35 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2010-05-15 14:16:35 +0000 |
| commit | e73a175d6d73f3241e157c416c1f03cab241e0e1 (patch) | |
| tree | b72dee1e01a24a6d24a4db6715b5c7b00d8fe453 | |
| parent | 5508d40d4bf582caaabb59ef1346b982948dcf2d (diff) | |
| download | rockbox-e73a175d6d73f3241e157c416c1f03cab241e0e1.zip rockbox-e73a175d6d73f3241e157c416c1f03cab241e0e1.tar.gz rockbox-e73a175d6d73f3241e157c416c1f03cab241e0e1.tar.bz2 rockbox-e73a175d6d73f3241e157c416c1f03cab241e0e1.tar.xz | |
Hopefully finish off the red from r26051.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26053 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/settings.h | 4 | ||||
| -rw-r--r-- | firmware/drivers/audio/wm8985.c | 4 | ||||
| -rw-r--r-- | firmware/export/wm8985.h | 6 | ||||
| -rw-r--r-- | firmware/target/mips/ingenic_jz47xx/codec-jz4740.c | 6 |
4 files changed, 18 insertions, 2 deletions
diff --git a/apps/settings.h b/apps/settings.h index c8e8d64..8c58fed 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -336,8 +336,10 @@ struct user_settings bool superbass; /* true/false */ #endif -#if defined(HAVE_WM8758) || defined(HAVE_WM8978) +#ifdef AUDIOHW_HAVE_BASS_CUTOFF int bass_cutoff; +#endif +#ifdef AUDIOHW_HAVE_TREBLE_CUTOFF int treble_cutoff; #endif diff --git a/firmware/drivers/audio/wm8985.c b/firmware/drivers/audio/wm8985.c index 18fd7c5..da08b44 100644 --- a/firmware/drivers/audio/wm8985.c +++ b/firmware/drivers/audio/wm8985.c @@ -99,8 +99,12 @@ const struct sound_settings_info audiohw_settings[] = { [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0}, [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16}, #endif +#ifdef AUDIOHW_HAVE_BASS_CUTOFF [SOUND_BASS_CUTOFF] = {"", 0, 1, 1, 4, 1}, +#endif +#ifdef AUDIOHW_HAVE_TREBLE_CUTOFF [SOUND_TREBLE_CUTOFF] = {"", 0, 1, 1, 4, 1}, +#endif }; /* shadow registers */ diff --git a/firmware/export/wm8985.h b/firmware/export/wm8985.h index 5d036a6..c6b8e38 100644 --- a/firmware/export/wm8985.h +++ b/firmware/export/wm8985.h @@ -26,7 +26,13 @@ #define VOLUME_MIN -570 #define VOLUME_MAX 60 +#ifdef COWON_D2 +/* FIXME: somehow something was out of sync in the .lang, settings and caps. Keep the + * cutoffs disabled until someone with the device works it out. */ +#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP) +#else #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | BASS_CUTOFF_CAP | TREBLE_CUTOFF_CAP) +#endif extern int tenthdb2master(int db); diff --git a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c index ce6d889..ab9efc9 100644 --- a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c @@ -21,7 +21,7 @@ #include "config.h" #include "audio.h" -#include "audiohw.h" +#include "sound.h" #include "jz4740.h" #include "system.h" @@ -33,8 +33,12 @@ const struct sound_settings_info audiohw_settings[] = { [SOUND_VOLUME] = {"dB", 0, 1, 0, 6, 0}, #endif /* HAVE_SW_TONE_CONTROLS */ +#ifdef AUDIOHW_HAVE_BASS [SOUND_BASS] = {"dB", 0, 1, -24, 24, 0}, +#endif +#ifdef AUDIOHW_HAVE_TREBLE [SOUND_TREBLE] = {"dB", 0, 1, -24, 24, 0}, +#endif [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, |