From 825d89fe282a6797cef5ef7266c908d2986334d4 Mon Sep 17 00:00:00 2001 From: Peter D'Hoye Date: Sun, 25 May 2008 21:19:07 +0000 Subject: Accept FS #9021 by James Vasile and apply the fix to the other drivers that have the same issue. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17630 a1c6a512-1295-4272-9138-f99709370657 --- docs/CREDITS | 1 + firmware/drivers/audio/as3514.c | 2 +- firmware/drivers/audio/mas35xx.c | 2 +- firmware/drivers/audio/tsc2100.c | 2 ++ firmware/drivers/audio/uda1380.c | 2 ++ firmware/drivers/audio/wm8758.c | 2 ++ firmware/drivers/audio/wm8975.c | 2 ++ 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/CREDITS b/docs/CREDITS index 6b23bad60e..64750e879a 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -391,6 +391,7 @@ John Kaminar Joris Goosen Mark Ganson Davide Gentile +James Vasile The libmad team diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index b801375846..01dc23b963 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c @@ -37,7 +37,7 @@ const struct sound_settings_info audiohw_settings[] = { [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, -#if defined(HAVE_RECORDING) +#ifdef HAVE_RECORDING [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 39, 23}, [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 31, 23}, [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 31, 23}, diff --git a/firmware/drivers/audio/mas35xx.c b/firmware/drivers/audio/mas35xx.c index 1a0d2afe45..9d80ac93d1 100644 --- a/firmware/drivers/audio/mas35xx.c +++ b/firmware/drivers/audio/mas35xx.c @@ -47,7 +47,7 @@ const struct sound_settings_info audiohw_settings[] = { [SOUND_MDB_ENABLE] = {"", 0, 1, 0, 1, 0}, [SOUND_SUPERBASS] = {"", 0, 1, 0, 1, 0}, #endif -#if CONFIG_CODEC == MAS3587F +#if CONFIG_CODEC == MAS3587F && defined(HAVE_RECORDING) [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 15, 8}, [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 15, 8}, [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 15, 2}, diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c index 08306b3823..dfa24cf848 100644 --- a/firmware/drivers/audio/tsc2100.c +++ b/firmware/drivers/audio/tsc2100.c @@ -35,10 +35,12 @@ const struct sound_settings_info audiohw_settings[] = { [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, +#ifdef HAVE_RECORDING [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 39, 23}, [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 31, 23}, [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 31, 23}, #endif +#endif }; static bool is_muted = false; /* convert tenth of dB volume to master volume register value */ diff --git a/firmware/drivers/audio/uda1380.c b/firmware/drivers/audio/uda1380.c index 388e59b1d2..a344a248b3 100644 --- a/firmware/drivers/audio/uda1380.c +++ b/firmware/drivers/audio/uda1380.c @@ -33,9 +33,11 @@ const struct sound_settings_info audiohw_settings[] = { [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, +#ifdef HAVE_RECORDING [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0}, [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0}, [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16}, +#endif }; /* convert tenth of dB volume (-840..0) to master volume register value */ diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index 8f452f7a09..b380530e39 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c @@ -38,9 +38,11 @@ const struct sound_settings_info audiohw_settings[] = { [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, +#ifdef HAVE_RECORDING [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0}, [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0}, [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16}, +#endif [SOUND_BASS_CUTOFF] = {"", 0, 1, 1, 4, 1}, [SOUND_TREBLE_CUTOFF] = {"", 0, 1, 1, 4, 1}, }; diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c index 297aabda78..c207895a97 100644 --- a/firmware/drivers/audio/wm8975.c +++ b/firmware/drivers/audio/wm8975.c @@ -42,9 +42,11 @@ const struct sound_settings_info audiohw_settings[] = { [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, +#ifdef HAVE_RECORDING [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0}, [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0}, [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16}, +#endif }; /* convert tenth of dB volume (-730..60) to master volume register value */ -- cgit v1.2.3