summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2012-07-29 11:10:12 +0200
committerDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2012-07-29 11:10:12 +0200
commit94e5efb63b7d4400b9cb51ffe5c4279453375b6b (patch)
tree2e0b026a647cc482aa68b637536f22c537651570 /audio
parent5b75dcedccee5fa43d2ef9575daebaa579b22ae2 (diff)
downloaddevice_samsung_i9300-94e5efb63b7d4400b9cb51ffe5c4279453375b6b.zip
device_samsung_i9300-94e5efb63b7d4400b9cb51ffe5c4279453375b6b.tar.gz
device_samsung_i9300-94e5efb63b7d4400b9cb51ffe5c4279453375b6b.tar.bz2
audio: reset mixer states when bluetooth was in use for incall
Diffstat (limited to 'audio')
-rwxr-xr-xaudio/audio_hw.c4
-rw-r--r--audio/audio_hw.h14
2 files changed, 18 insertions, 0 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 8c7a707..5b4736b 100755
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -623,7 +623,11 @@ static void select_output_device(struct m0_audio_device *adev)
set_bigroute_by_array(adev->mixer, bt_input, 1);
ALOGD("%s: set voicecall route: bt_output", __func__);
set_bigroute_by_array(adev->mixer, bt_output, 1);
+ } else {
+ ALOGD("%s: set voicecall route: bt_disable", __func__);
+ set_bigroute_by_array(adev->mixer, bt_disable, 1);
}
+
set_incall_device(adev);
}
}
diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index a2b33ca..c395d9f 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -218,3 +218,17 @@ struct route_setting bt_input[] = {
{ .ctl_name = "AIF2DAC Volume", .intval = 96, },
{ .ctl_name = NULL, },
};
+
+struct route_setting bt_disable[] = {
+ { .ctl_name = "AIF2ADC Mux", .intval = 0, },
+ { .ctl_name = "MIXINL IN2L Volume", .intval = 0, },
+ { .ctl_name = "LINEOUT1N Switch", .intval = 1, },
+ { .ctl_name = "LINEOUT1P Switch", .intval = 1, },
+ { .ctl_name = "AIF2ADC HPF Mode", .intval = 0, },
+ { .ctl_name = "AIF2ADC HPF Switch", .intval = 0, },
+ { .ctl_name = "AIF2DAC2R Mixer AIF2 Switch", .intval = 0, },
+ { .ctl_name = "AIF2DAC2L Mixer AIF2 Switch", .intval = 0, },
+ { .ctl_name = "AIF1ADC1R Mixer AIF2 Switch", .intval = 0, },
+ { .ctl_name = "AIF1ADC1L Mixer AIF2 Switch", .intval = 0, },
+ { .ctl_name = NULL, },
+};