summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorDheeraj CVR <cvr.dheeraj@gmail.com>2014-08-04 06:02:26 +0530
committertilaksidduram <tilaksidduram@gmail.com>2014-08-07 10:23:37 +0530
commit108dcbe431508f7424046e55ee2f4ae88ae49648 (patch)
tree3dec04526d90a927c179d3e40c3f83566bdb5008 /audio
parent5bb524184033eab64fbb3337eaf46211f682edae (diff)
downloaddevice_samsung_n7100-108dcbe431508f7424046e55ee2f4ae88ae49648.zip
device_samsung_n7100-108dcbe431508f7424046e55ee2f4ae88ae49648.tar.gz
device_samsung_n7100-108dcbe431508f7424046e55ee2f4ae88ae49648.tar.bz2
audio: make builtin mic and back mic volumes consistent
Change-Id: I9f94363e78bed7b3185110d1f7d90a9f36a4ba10
Diffstat (limited to 'audio')
-rw-r--r--audio/audio_hw.c5
-rw-r--r--audio/audio_hw.h9
2 files changed, 2 insertions, 12 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index f0f2233..e567e38 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -88,7 +88,6 @@ struct m0_audio_device {
struct m0_dev_cfg *dev_cfgs;
int num_dev_cfgs;
struct mixer *mixer;
- struct mixer_ctls mixer_ctls;
audio_mode_t mode;
int active_out_device;
int out_device;
@@ -3020,10 +3019,6 @@ static int adev_open(const hw_module_t* module, const char* name,
return -EINVAL;
}
- /* +30db boost for mics */
- adev->mixer_ctls.mixinl_in1l_volume = mixer_get_ctl_by_name(adev->mixer, "MIXINL IN1L Volume");
- adev->mixer_ctls.mixinl_in2l_volume = mixer_get_ctl_by_name(adev->mixer, "MIXINL IN2L Volume");
-
ret = adev_config_parse(adev);
if (ret != 0)
goto err_mixer;
diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index d7c655b..88433ed 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -97,12 +97,6 @@ enum output_type {
OUTPUT_TOTAL
};
-struct mixer_ctls
-{
- struct mixer_ctl *mixinl_in1l_volume;
- struct mixer_ctl *mixinl_in2l_volume;
-};
-
struct route_setting
{
char *ctl_name;
@@ -143,7 +137,8 @@ struct route_setting default_input[] = {
{ .ctl_name = "AIF1ADCR Source", .intval = 1, },
{ .ctl_name = "AIF2ADCR Source", .intval = 1, },
{ .ctl_name = "MIXINR IN1R Switch", .intval = 1, },
- { .ctl_name = "IN1L Volume", .intval = 25, },
+ { .ctl_name = "IN2L Volume", .intval = 25, },
+ { .ctl_name = "IN1R Volume", .intval = 25, },
{ .ctl_name = "MIXINL IN2L Volume", .intval = 0, },
{ .ctl_name = "DAC2 Left Sidetone Volume", .intval = 12, },
{ .ctl_name = "DAC2 Right Sidetone Volume", .intval = 12, },