diff options
author | Sergii Iegorov | 2013-04-11 12:17:35 -0500 |
---|---|---|
committer | Sergii Iegorov | 2013-04-11 12:17:35 -0500 |
commit | 2749124f4584fd4341d8c3302bccbdadb5679354 (patch) | |
tree | 712e33a3de920b85504c3bd30d43e522aa70cce7 /audio | |
parent | 1892d5bbd0f61243186d7c1b623f815e5fecdf10 (diff) | |
download | device-ti-common-open-2749124f4584fd4341d8c3302bccbdadb5679354.tar.gz device-ti-common-open-2749124f4584fd4341d8c3302bccbdadb5679354.tar.xz device-ti-common-open-2749124f4584fd4341d8c3302bccbdadb5679354.zip |
Revert "Audio HAL: Using wired headset for camcoder recording on Tablet."
This reverts commit 1892d5bbd0f61243186d7c1b623f815e5fecdf10.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/audio_hw.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 47bb5b0..56c07e4 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c | |||
@@ -1751,12 +1751,10 @@ static void select_input_device(struct omap_audio_device *adev) | |||
1751 | 1751 | ||
1752 | if (!bt_on) { | 1752 | if (!bt_on) { |
1753 | if ((adev->mode != AUDIO_MODE_IN_CALL) && (adev->active_input != 0)) { | 1753 | if ((adev->mode != AUDIO_MODE_IN_CALL) && (adev->active_input != 0)) { |
1754 | if (adev->board_type == OMAP4_BLAZE) { | 1754 | /* sub mic is used for camcorder or VoIP on speaker phone */ |
1755 | /* sub mic is used for camcorder or VoIP on speaker phone */ | 1755 | sub_mic_on = (adev->active_input->source == AUDIO_SOURCE_CAMCORDER) || |
1756 | sub_mic_on = (adev->active_input->source == AUDIO_SOURCE_CAMCORDER) || | 1756 | ((adev->devices.out_devices & AUDIO_DEVICE_OUT_SPEAKER) && |
1757 | ((adev->devices.out_devices & AUDIO_DEVICE_OUT_SPEAKER) && | 1757 | (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION)); |
1758 | (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION)); | ||
1759 | } | ||
1760 | } | 1758 | } |
1761 | if (!sub_mic_on) { | 1759 | if (!sub_mic_on) { |
1762 | headset_on = adev->devices.in_devices & AUDIO_DEVICE_IN_WIRED_HEADSET; | 1760 | headset_on = adev->devices.in_devices & AUDIO_DEVICE_IN_WIRED_HEADSET; |