diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-05-29 22:16:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-29 22:16:20 +0000 |
| commit | e1f939bf0e1bac806b7da1b316e70c96426dc1b6 (patch) | |
| tree | 915bde554563a4d65e978430bdfa0bf4e7ada350 /services/audioflinger/Threads.cpp | |
| parent | 76b1d55b69f0d1d36bb96ab0c206ef1eff715d82 (diff) | |
| parent | 84d61caa6040e346df68dbe6f8e4fe339906de08 (diff) | |
| download | frameworks_av-e1f939bf0e1bac806b7da1b316e70c96426dc1b6.zip frameworks_av-e1f939bf0e1bac806b7da1b316e70c96426dc1b6.tar.gz frameworks_av-e1f939bf0e1bac806b7da1b316e70c96426dc1b6.tar.bz2 | |
Merge "Add more device codes for symbolic display" into mnc-dev
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 0593e1b..7809eff 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -356,13 +356,47 @@ String8 devicesToString(audio_devices_t devices) AUDIO_DEVICE_OUT_SPEAKER, "SPEAKER", AUDIO_DEVICE_OUT_WIRED_HEADSET, "WIRED_HEADSET", AUDIO_DEVICE_OUT_WIRED_HEADPHONE, "WIRED_HEADPHONE", + AUDIO_DEVICE_OUT_BLUETOOTH_SCO, "BLUETOOTH_SCO", + AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET, "BLUETOOTH_SCO_HEADSET", + AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT, "BLUETOOTH_SCO_CARKIT", + AUDIO_DEVICE_OUT_BLUETOOTH_A2DP, "BLUETOOTH_A2DP", + AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES, "BLUETOOTH_A2DP_HEADPHONES", + AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER, "BLUETOOTH_A2DP_SPEAKER", + AUDIO_DEVICE_OUT_AUX_DIGITAL, "AUX_DIGITAL", + AUDIO_DEVICE_OUT_HDMI, "HDMI", + AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "ANLG_DOCK_HEADSET", + AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "DGTL_DOCK_HEADSET", + AUDIO_DEVICE_OUT_USB_ACCESSORY, "USB_ACCESSORY", + AUDIO_DEVICE_OUT_USB_DEVICE, "USB_DEVICE", AUDIO_DEVICE_OUT_TELEPHONY_TX, "TELEPHONY_TX", + AUDIO_DEVICE_OUT_LINE, "LINE", + AUDIO_DEVICE_OUT_HDMI_ARC, "HDMI_ARC", + AUDIO_DEVICE_OUT_SPDIF, "SPDIF", + AUDIO_DEVICE_OUT_FM, "FM", + AUDIO_DEVICE_OUT_AUX_LINE, "AUX_LINE", + AUDIO_DEVICE_OUT_SPEAKER_SAFE, "SPEAKER_SAFE", AUDIO_DEVICE_NONE, "NONE", // must be last }, mappingsIn[] = { + AUDIO_DEVICE_IN_COMMUNICATION, "COMMUNICATION", + AUDIO_DEVICE_IN_AMBIENT, "AMBIENT", AUDIO_DEVICE_IN_BUILTIN_MIC, "BUILTIN_MIC", + AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, "BLUETOOTH_SCO_HEADSET", AUDIO_DEVICE_IN_WIRED_HEADSET, "WIRED_HEADSET", + AUDIO_DEVICE_IN_AUX_DIGITAL, "AUX_DIGITAL", AUDIO_DEVICE_IN_VOICE_CALL, "VOICE_CALL", + AUDIO_DEVICE_IN_TELEPHONY_RX, "TELEPHONY_RX", + AUDIO_DEVICE_IN_BACK_MIC, "BACK_MIC", AUDIO_DEVICE_IN_REMOTE_SUBMIX, "REMOTE_SUBMIX", + AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET, "ANLG_DOCK_HEADSET", + AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET, "DGTL_DOCK_HEADSET", + AUDIO_DEVICE_IN_USB_ACCESSORY, "USB_ACCESSORY", + AUDIO_DEVICE_IN_USB_DEVICE, "USB_DEVICE", + AUDIO_DEVICE_IN_FM_TUNER, "FM_TUNER", + AUDIO_DEVICE_IN_TV_TUNER, "TV_TUNER", + AUDIO_DEVICE_IN_LINE, "LINE", + AUDIO_DEVICE_IN_SPDIF, "SPDIF", + AUDIO_DEVICE_IN_BLUETOOTH_A2DP, "BLUETOOTH_A2DP", + AUDIO_DEVICE_IN_LOOPBACK, "LOOPBACK", AUDIO_DEVICE_NONE, "NONE", // must be last }; String8 result; |