diff options
| author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-08-02 19:05:48 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-08-02 19:05:48 +0200 |
| commit | 1baa48a0c36845e954f40d3ba9ea2b57da1c9478 (patch) | |
| tree | 5861d83321445b74fdad96fecc0f5a786c5baf09 /audio/audio_hw.c | |
| parent | 95929406683a570ba21a7842cd411599352b07b0 (diff) | |
| download | device_samsung_p3100-1baa48a0c36845e954f40d3ba9ea2b57da1c9478.zip device_samsung_p3100-1baa48a0c36845e954f40d3ba9ea2b57da1c9478.tar.gz device_samsung_p3100-1baa48a0c36845e954f40d3ba9ea2b57da1c9478.tar.bz2 | |
audio: some incall fixes
Change-Id: I84f13e59445063be1566b38d9e80b2a4102b6759
Diffstat (limited to 'audio/audio_hw.c')
| -rwxr-xr-x | audio/audio_hw.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index e861fc6..e51856b 100755 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -592,15 +592,23 @@ static void select_output_device(struct espresso_audio_device *adev) } if (headset_on || headphone_on || speaker_on || earpiece_on) { - ALOGD("%s: set bigroute: voicecall_input_default", __func__); + ALOGD("%s: set voicecall: voicecall_default", __func__); set_bigroute_by_array(adev->mixer, voicecall_default, 1); } else { - ALOGD("%s: set bigroute: voicecall_input_default_disable", __func__); + ALOGD("%s: set voicecall: voicecall_default_disable", __func__); set_bigroute_by_array(adev->mixer, voicecall_default_disable, 1); } + if (speaker_on || earpiece_on || headphone_on) { + ALOGD("%s: set voicecall route: default_input", __func__); + set_bigroute_by_array(adev->mixer, default_input, 1); + } else { + ALOGD("%s: set voicecall route: default_input_disable", __func__); + set_bigroute_by_array(adev->mixer, default_input_disable, 1); + } + if (headset_on || headphone_on) { - ALOGD("%s: set bigroute: headset_input", __func__); + ALOGD("%s: set voicecall: headset_input", __func__); set_bigroute_by_array(adev->mixer, headset_input, 1); } @@ -608,9 +616,9 @@ static void select_output_device(struct espresso_audio_device *adev) // bt uses a different port (PORT_BT) for playback, reopen the pcms end_call(adev); start_call(adev); - ALOGD("%s: set bigroute: bt_input", __func__); + ALOGD("%s: set voicecall: bt_input", __func__); set_bigroute_by_array(adev->mixer, bt_input, 1); - ALOGD("%s: set bigroute: bt_output", __func__); + ALOGD("%s: set voicecall: bt_output", __func__); set_bigroute_by_array(adev->mixer, bt_output, 1); } set_incall_device(adev); @@ -626,13 +634,14 @@ static void select_input_device(struct espresso_audio_device *adev) case AUDIO_DEVICE_IN_BACK_MIC: ALOGD("%s: AUDIO_DEVICE_IN_BACK_MIC", __func__); break; - case AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET: - ALOGD("%s: AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET", __func__); - break; case AUDIO_DEVICE_IN_WIRED_HEADSET: ALOGD("%s: AUDIO_DEVICE_IN_WIRED_HEADSET", __func__); break; + case AUDIO_DEVICE_IN_ALL_SCO: + ALOGD("%s: AUDIO_DEVICE_IN_ALL_SCO", __func__); + break; default: + ALOGD("%s: AUDIO_DEVICE_IN_DEFAULT", __func__); break; } |