devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fix some problems with missing HAVE_RECORDING checks #2

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17545 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Christian Gmeiner 2008-05-16 20:51:56 +00:00
parent 56fceacfeb
commit 2ea6da1ebf
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/drivers/audio/tlv320.c
View file

@ -37,9 +37,11 @@ const struct sound_settings_info audiohw_settings[] = {
[SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0},
[SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0},
[SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100},
#ifdef HAVE_RECORDING
[SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 31, 23}, [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 31, 23},
[SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 31, 23}, [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 31, 23},
[SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 1, 1}, [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 1, 1},
#endif
}; };
/* convert tenth of dB volume (-840..0) to master volume register value */ /* convert tenth of dB volume (-840..0) to master volume register value */

2
firmware/drivers/audio/wm8985.c
View file

@ -105,9 +105,11 @@ const struct sound_settings_info audiohw_settings[] = {
[SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0},
[SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0},
[SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100},
#ifdef HAVE_RECORDING
[SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0}, [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0},
[SOUND_RIGHT_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}, [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16},
#endif
[SOUND_BASS_CUTOFF] = {"", 0, 1, 1, 4, 1}, [SOUND_BASS_CUTOFF] = {"", 0, 1, 1, 4, 1},
[SOUND_TREBLE_CUTOFF] = {"", 0, 1, 1, 4, 1}, [SOUND_TREBLE_CUTOFF] = {"", 0, 1, 1, 4, 1},
}; };

3
firmware/sound.c
View file

@ -665,6 +665,7 @@ int sound_val2phys(int setting, int value)
switch(setting) switch(setting)
{ {
#ifdef HAVE_RECORDING
case SOUND_LEFT_GAIN: case SOUND_LEFT_GAIN:
case SOUND_RIGHT_GAIN: case SOUND_RIGHT_GAIN:
result = (value - 23) * 15; /* (x - 23)/1.5 *10 */ result = (value - 23) * 15; /* (x - 23)/1.5 *10 */
@ -673,7 +674,7 @@ int sound_val2phys(int setting, int value)
case SOUND_MIC_GAIN: case SOUND_MIC_GAIN:
result = value * 200; /* 0 or 20 dB */ result = value * 200; /* 0 or 20 dB */
break; break;
#endif
default: default:
result = value; result = value;
break; break;