diff options
| author | UK KIM <w0806.kim@samsung.com> | 2010-11-01 20:03:20 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-11-02 08:44:27 -0700 |
| commit | 67082e897ea7c1081ba3a42f10aa8b6c971749f5 (patch) | |
| tree | 66965edf24342ce83b328b911a1d456799e038b3 /libaudio2 | |
| parent | 95fc16edea50b1071f4927e491ba859bd4ddd8cb (diff) | |
| download | device_samsung_crespo-67082e897ea7c1081ba3a42f10aa8b6c971749f5.zip device_samsung_crespo-67082e897ea7c1081ba3a42f10aa8b6c971749f5.tar.gz device_samsung_crespo-67082e897ea7c1081ba3a42f10aa8b6c971749f5.tar.bz2 | |
S5PC11X: SOUND: added IPC type of headphone and used it for headphone device.
IPC enum : 0x05
this commit has depandancy with https://partner.source.android.com/g/#change,3740
Change-Id: Iaf1037a841fc76f86cf0a8b6e1f375010233c8ee
Signed-off-by: UK KIM <w0806.kim@samsung.com>
Diffstat (limited to 'libaudio2')
| -rw-r--r-- | libaudio2/AudioHardware.cpp | 6 | ||||
| -rw-r--r-- | libaudio2/secril-client.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libaudio2/AudioHardware.cpp b/libaudio2/AudioHardware.cpp index 0eee17a..7cff057 100644 --- a/libaudio2/AudioHardware.cpp +++ b/libaudio2/AudioHardware.cpp @@ -601,7 +601,6 @@ status_t AudioHardware::setIncallPath_l(uint32_t device) break; case AudioSystem::DEVICE_OUT_SPEAKER: - case AudioSystem::DEVICE_OUT_WIRED_HEADPHONE : LOGI("### incall mode speaker route"); path = SOUND_AUDIO_PATH_SPEAKER; break; @@ -617,6 +616,11 @@ status_t AudioHardware::setIncallPath_l(uint32_t device) } break; + case AudioSystem::DEVICE_OUT_WIRED_HEADPHONE : + LOGI("### incall mode headphone route"); + path = SOUND_AUDIO_PATH_HEADPHONE; + break; + case AudioSystem::DEVICE_OUT_WIRED_HEADSET : LOGI("### incall mode headset route"); path = SOUND_AUDIO_PATH_HEADSET; diff --git a/libaudio2/secril-client.h b/libaudio2/secril-client.h index 2473ae7..7bbaa03 100644 --- a/libaudio2/secril-client.h +++ b/libaudio2/secril-client.h @@ -138,7 +138,8 @@ typedef enum _AudioPath { SOUND_AUDIO_PATH_HEADSET, SOUND_AUDIO_PATH_SPEAKER, SOUND_AUDIO_PATH_BLUETOOTH, - SOUND_AUDIO_PATH_BLUETOOTH_NO_NR + SOUND_AUDIO_PATH_BLUETOOTH_NO_NR, + SOUND_AUDIO_PATH_HEADPHONE } AudioPath; /** |