summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDheeraj CVR <cvr.dheeraj@gmail.com>2014-08-04 05:55:14 +0530
committerforkbomb <keepcalm444@gmail.com>2015-11-25 08:07:32 +1100
commit76cf1a7dac84a931f6006a7a8d99e60d56183633 (patch)
treeafdb61446566e7b31499bccf524267a5da65ae93
parent2778a86eb13bf85b0818dcaf75fccb6a0846d12f (diff)
downloaddevice_samsung_i9300-76cf1a7dac84a931f6006a7a8d99e60d56183633.zip
device_samsung_i9300-76cf1a7dac84a931f6006a7a8d99e60d56183633.tar.gz
device_samsung_i9300-76cf1a7dac84a931f6006a7a8d99e60d56183633.tar.bz2
audio: make builtin mic and back mic volumes consistent
Change-Id: I25cab57acb84a14200006e832a43676ff3c8b9d0
-rw-r--r--audio/audio_hw.c5
-rw-r--r--audio/audio_hw.h7
-rw-r--r--configs/tiny_hw.xml2
3 files changed, 2 insertions, 12 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index e32acf0..d32596b 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 33930a7..bcb7485 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,6 +137,7 @@ struct route_setting default_input[] = {
{ .ctl_name = "AIF2ADCR Source", .intval = 1, },
{ .ctl_name = "MIXINR IN1R Switch", .intval = 1, },
{ .ctl_name = "IN1L Volume", .intval = 25, },
+ { .ctl_name = "IN1R Volume", .intval = 25, },
{ .ctl_name = "MIXINL IN1L Volume", .intval = 0, },
{ .ctl_name = "DAC2 Left Sidetone Volume", .intval = 12, },
{ .ctl_name = "DAC2 Right Sidetone Volume", .intval = 12, },
diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml
index 8ffa698..f5f9aea 100644
--- a/configs/tiny_hw.xml
+++ b/configs/tiny_hw.xml
@@ -253,7 +253,7 @@ We are able to have most of our routing static so do that
<device name="builtin-mic">
<path name="on">
<ctl name="Main Mic Switch" val="1"/>
- <ctl name="IN1L Volume" val="13"/>
+ <ctl name="IN1L Volume" val="28"/>
<ctl name="MIXINL IN1L Switch" val="1"/>
<ctl name="MIXINL IN1L Volume" val="1"/>
<ctl name="AIF1ADCL Source" val="Left"/>