From 58fc4654a6ec94f15b07e0642aa1cb16d6474a78 Mon Sep 17 00:00:00 2001 From: Simon Wilson Date: Mon, 31 Oct 2011 12:57:18 -0700 Subject: audio: force speaker route for call when docked As we did for the HDMI audio case, force the speaker route for calls when in a digital dock because we cannot directly route the modem audio output through the S/PDIF output because it is a McASP device. Fixes bug 5434090 Change-Id: I52ff7877a8be778b9e74eebb3ad2c9f13b634bca --- audio/audio_hw.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'audio') diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 2a58f4f..55d221d 100755 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -697,6 +697,7 @@ static void set_incall_device(struct tuna_audio_device *adev) break; case AUDIO_DEVICE_OUT_SPEAKER: case AUDIO_DEVICE_OUT_AUX_DIGITAL: + case AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET: device_type = SOUND_AUDIO_PATH_SPEAKER; break; case AUDIO_DEVICE_OUT_WIRED_HEADSET: @@ -951,9 +952,11 @@ static void select_output_device(struct tuna_audio_device *adev) break; case TTY_MODE_OFF: default: - /* force speaker on when in call and HDMI is selected as voice DL audio - * cannot be routed to HDMI by ABE */ - if (adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) + /* force speaker on when in call and HDMI or S/PDIF is selected + * as voice DL audio cannot be routed there by ABE */ + if (adev->devices & + (AUDIO_DEVICE_OUT_AUX_DIGITAL | + AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) speaker_on = 1; break; } -- cgit v1.1