diff options
| author | Max Weffers <rcstar6696@gmail.com> | 2017-04-27 10:48:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@8bce66e3eceb> | 2017-04-27 10:48:54 +0000 |
| commit | 73fb6254549be812eee17a4f71aef376355fd306 (patch) | |
| tree | 6b273eb2ad1ba850b033c3e85b8dc8de7b7481e3 | |
| parent | 3b155a8e758a9bf4541c5c5b4c801d1a2d8f5de8 (diff) | |
| parent | 81e16ef2944d0b0847c416d0e7796e454f66700b (diff) | |
Merge "shinano-common: Remove audio_platform_info unused devices." into cm-14.1
| -rw-r--r-- | audio/audio_platform_info.xml | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml index 52e7b2c..83ab430 100644 --- a/audio/audio_platform_info.xml +++ b/audio/audio_platform_info.xml @@ -30,9 +30,6 @@ <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15" /> <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" acdb_id="15" /> <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="15" /> - <device name="SND_DEVICE_OUT_VOIP_HANDSET" acdb_id="7" /> - <device name="SND_DEVICE_OUT_VOIP_SPEAKER" acdb_id="15" /> - <device name="SND_DEVICE_OUT_VOIP_HEADPHONES" acdb_id="10" /> <!-- Input devices --> <device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="544" /> @@ -44,28 +41,20 @@ <device name="SND_DEVICE_OUT_HANDSET" backend="handset" /> <device name="SND_DEVICE_OUT_SPEAKER" backend="speaker" /> <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker" /> + <device name="SND_DEVICE_OUT_SPEAKER_SAFE" backend="speaker" /> <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" /> <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" /> <device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="speaker" /> <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="handset" /> <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-anc-nc-headphone" /> - <device name="SND_DEVICE_OUT_VOIP_HANDSET" backend="handset" /> - <device name="SND_DEVICE_OUT_VOIP_SPEAKER" backend="speaker" /> - - <!-- Input devices --> </backend_names> - <pcm_ids> - <!-- empty --> - </pcm_ids> - <device_names> <!-- Output devices --> - <device name="SND_DEVICE_OUT_VOIP_HANDSET" alias="voice-handset" /> - <device name="SND_DEVICE_OUT_VOIP_SPEAKER" alias="voice-speaker" /> - <device name="SND_DEVICE_OUT_VOIP_HEADPHONES" alias="voice-headphones" /> + <device name="SND_DEVICE_OUT_SPEAKER_SAFE" alias="speaker-protected" /> + <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" alias="voice-handset-hac" /> - <!-- Input devices --> - <device name="SND_DEVICE_IN_VOICE_REC_MIC" alias="handset-mic-asr" /> + <!-- Input devices --> + <device name="SND_DEVICE_IN_HDMI_MIC" alias="hdmi-mic" /> </device_names> </audio_platform_info> |