diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2013-03-28 20:54:05 +0000 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2013-03-28 20:54:05 +0000 |
| commit | 80fad11cdc879a3aaa8894b8225f7bea63bdb583 (patch) | |
| tree | 4cdd96de0f46937c23266ca69b3e019b2b546e6d /audio | |
| parent | a99f64e2534b621e7d023cca87b84d851daa061d (diff) | |
| download | device_samsung_i9305-80fad11cdc879a3aaa8894b8225f7bea63bdb583.zip device_samsung_i9305-80fad11cdc879a3aaa8894b8225f7bea63bdb583.tar.gz device_samsung_i9305-80fad11cdc879a3aaa8894b8225f7bea63bdb583.tar.bz2 | |
i9305: fix dock audio, config cleanup
Change-Id: I03aee53eddfbaa7978c47321e306f490e5d56f33
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index bdf7599..43fdb8b 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -536,8 +536,9 @@ static void set_incall_device(struct m0_audio_device *adev) voice_index = 5; break; case AUDIO_DEVICE_OUT_SPEAKER: - case AUDIO_DEVICE_OUT_AUX_DIGITAL: + case AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET: case AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET: + case AUDIO_DEVICE_OUT_AUX_DIGITAL: rx_dev_id = DEVICE_SPEAKER_MONO_RX_ACDB_ID; tx_dev_id = DEVICE_SPEAKER_TX_ACDB_ID; voice_index = 7; @@ -726,6 +727,12 @@ static void select_output_device(struct m0_audio_device *adev) case AUDIO_DEVICE_OUT_ALL_SCO: ALOGD("%s: AUDIO_DEVICE_OUT_ALL_SCO", __func__); break; + case AUDIO_DEVICE_OUT_USB_ACCESSORY: + ALOGD("%s: AUDIO_DEVICE_OUT_USB_ACCESSORY", __func__); + break; + case AUDIO_DEVICE_OUT_USB_DEVICE: + ALOGD("%s: AUDIO_DEVICE_OUT_USB_DEVICE", __func__); + break; default: ALOGD("%s: AUDIO_DEVICE_OUT_ALL", __func__); break; @@ -2935,9 +2942,10 @@ static const struct { { AUDIO_DEVICE_OUT_SPEAKER, "speaker" }, { AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE, "headphone" }, { AUDIO_DEVICE_OUT_EARPIECE, "earpiece" }, - { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "analog-dock" }, - { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "digital-dock" }, + { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "dock" }, + { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "dock" }, { AUDIO_DEVICE_OUT_ALL_SCO, "sco-out" }, + { AUDIO_DEVICE_OUT_AUX_DIGITAL, "aux-digital" }, { AUDIO_DEVICE_IN_BUILTIN_MIC, "builtin-mic" }, { AUDIO_DEVICE_IN_BACK_MIC, "back-mic" }, |