commit 5f2d31855a1b391628952fd1ad2dbe8e68d27977
author Steve Kondik <shade@chemlab.org> Mon Aug 12 17:22:55 2013 -0700
committer Steve Kondik <shade@chemlab.org> Mon Aug 12 17:22:55 2013 -0700
tree 95ed50c4211da39c28c7745df3f865c443076b0a
parent 7c6f509bc4346af5b9b9d081aa1c97338b8029ec

alsa_sound: Untangle VOIP/voice speaker handling

Change-Id: Ieedac3af120a08f567a6575fdb06e6e22946307d

alsa_sound/ALSADevice.cpp

diff --git a/alsa_sound/ALSADevice.cpp b/alsa_sound/ALSADevice.cpp
index 5c58760..6196a06 100644
--- a/alsa_sound/ALSADevice.cpp
+++ b/alsa_sound/ALSADevice.cpp
@@ -1826,15 +1826,13 @@
                 return strdup(SND_USE_CASE_DEV_EARPIECE); /* HANDSET RX */
             }
         } else if (devices & AudioSystem::DEVICE_OUT_SPEAKER) {
-#ifdef SEPERATED_VOICE_SPEAKER
 #ifdef SEPERATED_VOIP
             if (mCallMode == AUDIO_MODE_IN_COMMUNICATION) {
                 return strdup(SND_USE_CASE_DEV_VOIP_SPEAKER);
-            } else if (mCallMode == AUDIO_MODE_IN_CALL) {
-#else
-            if (mCallMode == AUDIO_MODE_IN_CALL ||
-                mCallMode == AUDIO_MODE_IN_COMMUNICATION) {
+            }
 #endif
+#ifdef SEPERATED_VOICE_SPEAKER
+            if (mCallMode == AUDIO_MODE_IN_CALL) {
                 return strdup(SND_USE_CASE_DEV_VOC_SPEAKER); /* Voice SPEAKER RX */
             }
 #endif