summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2011-08-05 12:59:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-05 12:59:34 -0700
commitfb0c56aef472011fa7ada903d07c6854390085e5 (patch)
treefb4cc9d9a81415a662a26ac05f573eb33205d0e9
parentfed0dce065b557708321a97b7378a27ad4211582 (diff)
parente522d0eeea3c764e35b6a2440de7051bda953b16 (diff)
downloaddevice_samsung_tuna-fb0c56aef472011fa7ada903d07c6854390085e5.zip
device_samsung_tuna-fb0c56aef472011fa7ada903d07c6854390085e5.tar.gz
device_samsung_tuna-fb0c56aef472011fa7ada903d07c6854390085e5.tar.bz2
Merge "audio: use 0dB gain for all mixers"
-rw-r--r--audio/audio_hw.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 95f8ef2..b0399da 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -75,7 +75,6 @@
/* Mixer control gain and route values */
#define MIXER_ABE_GAIN_0DB 120
-#define MIXER_ABE_GAIN_MINUS1DB 118
#define MIXER_CODEC_VOLUME_MAX 15
#define MIXER_PLAYBACK_HS_DAC "HS DAC"
#define MIXER_PLAYBACK_HF_DAC "HF DAC"
@@ -130,19 +129,19 @@ struct route_setting defaults[] = {
/* general */
{
.ctl_name = MIXER_DL1_MEDIA_PLAYBACK_VOLUME,
- .intval = MIXER_ABE_GAIN_MINUS1DB,
+ .intval = MIXER_ABE_GAIN_0DB,
},
{
.ctl_name = MIXER_DL2_MEDIA_PLAYBACK_VOLUME,
- .intval = MIXER_ABE_GAIN_MINUS1DB,
+ .intval = MIXER_ABE_GAIN_0DB,
},
{
.ctl_name = MIXER_DL1_VOICE_PLAYBACK_VOLUME,
- .intval = MIXER_ABE_GAIN_MINUS1DB,
+ .intval = MIXER_ABE_GAIN_0DB,
},
{
.ctl_name = MIXER_DL2_VOICE_PLAYBACK_VOLUME,
- .intval = MIXER_ABE_GAIN_MINUS1DB,
+ .intval = MIXER_ABE_GAIN_0DB,
},
{
.ctl_name = MIXER_SDT_DL_VOLUME,
@@ -204,7 +203,7 @@ struct route_setting defaults[] = {
/* bt */
{
.ctl_name = MIXER_BT_UL_VOLUME,
- .intval = MIXER_ABE_GAIN_MINUS1DB,
+ .intval = MIXER_ABE_GAIN_0DB,
},
{
.ctl_name = NULL,