commit cd0cadbee729ef3c7f4099316ae5c5155a1db5de
author Ethan Chen <intervigil@gmail.com> Fri Sep 13 01:56:30 2013 +0000
committer Gerrit Code Review <gerrit@cyanogenmod.org> Fri Sep 13 01:56:30 2013 +0000
tree 354d0a5aac4bbab426420fd86a4f0e077bf4089f
parent 78513a9ae6803c6ca0c7aaeaafb38782312d6a10
parent 58bd771e0b626c5edc6dbb1bfc2df0518387f6d8

Merge "alsa_sound: Fix CAMCORDER_TX use case" into cm-10.2

alsa_sound/ALSADevice.cpp

diff --git a/alsa_sound/ALSADevice.cpp b/alsa_sound/ALSADevice.cpp
index c11a513..d5b0d8c 100644
--- a/alsa_sound/ALSADevice.cpp
+++ b/alsa_sound/ALSADevice.cpp
@@ -2027,6 +2027,11 @@
                     return strdup(SND_USE_CASE_DEV_VOICE_RECOGNITION ); /* VOICE RECOGNITION TX */
                 }
 #endif
+#ifdef SEPERATED_CAMCORDER
+                if (mInputSource == AUDIO_SOURCE_CAMCORDER) {
+                    return strdup(SND_USE_CASE_DEV_CAMCORDER_TX); /* CAMCORDER TX */
+                }
+#endif
 #ifdef SEPERATED_VOIP
                 if (mCallMode == AUDIO_MODE_IN_COMMUNICATION) {
                     if (!strncmp(rxDevice, SND_USE_CASE_DEV_VOIP_EARPIECE,
@@ -2121,8 +2126,6 @@
 #ifdef SEPERATED_AUDIO_INPUT
                 if (mCallMode == AUDIO_MODE_IN_CALL) {
                     return strdup(SND_USE_CASE_DEV_VOC_LINE); /* Voice BUILTIN-MIC TX */
-                } else if(mInputSource == AUDIO_SOURCE_CAMCORDER) {
-                    return strdup(SND_USE_CASE_DEV_CAMCORDER_TX ); /* CAMCORDER TX */
                 } else
 #endif
                     return strdup(SND_USE_CASE_DEV_LINE); /* BUILTIN-MIC TX */

alsa_sound/Android.mk

diff --git a/alsa_sound/Android.mk b/alsa_sound/Android.mk
index 08d0b85..ac6a5af 100644
--- a/alsa_sound/Android.mk
+++ b/alsa_sound/Android.mk
@@ -73,6 +73,10 @@
     common_cflags += -DSEPERATED_AUDIO_INPUT
 endif
 
+ifeq ($(strip $(BOARD_USES_SEPERATED_CAMCORDER)),true)
+    common_cflags += -DSEPERATED_CAMCORDER
+endif
+
 ifeq ($(strip $(BOARD_USES_SEPERATED_VOICE_SPEAKER)),true)
     common_cflags += -DSEPERATED_VOICE_SPEAKER
 endif