summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz2014-08-20 18:19:08 -0500
committerMisael Lopez Cruz2014-08-25 03:10:27 -0500
commit867f08398c3c913a7823c2b04d04f93a20fdf2f7 (patch)
treefcf7a93a561e10051c779e305a1b37604428a1d0
parentd020834787b241ad558474ea95afd1a1a9d561c1 (diff)
downloaddevice-ti-common-open-867f08398c3c913a7823c2b04d04f93a20fdf2f7.tar.gz
device-ti-common-open-867f08398c3c913a7823c2b04d04f93a20fdf2f7.tar.xz
device-ti-common-open-867f08398c3c913a7823c2b04d04f93a20fdf2f7.zip
audio: tiaudioutils: Use multizone specific define
Use the OMAP_MULTIZONE_AUDIO define to check for multizone specific devices. The USB headset input is no longer supported as an OMAP_ENHANCEMENT so it's removed. Change-Id: Ie7b277a8cacf90aa6ce2a11073e0be093d237578 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-rw-r--r--audio/utils/src/ALSAMixer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/utils/src/ALSAMixer.cpp b/audio/utils/src/ALSAMixer.cpp
index 53b3d9a..a9f6f3f 100644
--- a/audio/utils/src/ALSAMixer.cpp
+++ b/audio/utils/src/ALSAMixer.cpp
@@ -322,8 +322,7 @@ void ALSAMixer::initDeviceMap()
322 addToDevMap(AUDIO_DEVICE_OUT_REMOTE_SUBMIX); 322 addToDevMap(AUDIO_DEVICE_OUT_REMOTE_SUBMIX);
323 addToDevMap(AUDIO_DEVICE_OUT_DEFAULT); 323 addToDevMap(AUDIO_DEVICE_OUT_DEFAULT);
324 324
325#ifdef OMAP_ENHANCEMENT 325#ifdef OMAP_MULTIZONE_AUDIO
326 addToDevMap(AUDIO_DEVICE_IN_USB_HEADSET);
327 addToDevMap(AUDIO_DEVICE_OUT_WIRED_HEADPHONE2); 326 addToDevMap(AUDIO_DEVICE_OUT_WIRED_HEADPHONE2);
328#endif 327#endif
329} 328}