commit 91e9fad9dff8746a5cd9d44ee4f1313d3ad7cfdc
author ehgrace.kim <ehgrace.kim@lge.com> Mon Jul 02 18:27:28 2012 -0700
committer Iliyan Malchev <malchev@google.com> Wed Jul 04 09:23:41 2012 -0700
tree 87b14545057e652ed43fdacfdafed2f095083508
parent c1748db63cc975291af971c85c9f902aa7a73f30

audio: modify the SPEAKER_RX_ACDB to support both MONO and STEREO speaker

Change-Id: I2e66f430b18ecfa3bfcdbb7c9f6d50354e2d0709

libalsa-intf/alsa_ucm.c

diff --git a/libalsa-intf/alsa_ucm.c b/libalsa-intf/alsa_ucm.c
index b32cc58..8503268 100644
--- a/libalsa-intf/alsa_ucm.c
+++ b/libalsa-intf/alsa_ucm.c
@@ -620,11 +620,11 @@
                     rx_id = ctrl_list[index].acdb_id;
                     tx_id = ctrl_list[use_case_index].acdb_id;
                 }
-                if(rx_id == DEVICE_SPEAKER_RX_ACDB_ID &&
-                   tx_id == DEVICE_HANDSET_TX_ACDB_ID) {
+                if(((rx_id == DEVICE_SPEAKER_MONO_RX_ACDB_ID)||(rx_id == DEVICE_SPEAKER_STEREO_RX_ACDB_ID))
+                    && tx_id == DEVICE_HANDSET_TX_ACDB_ID) {
                     tx_id = DEVICE_SPEAKER_TX_ACDB_ID;
-                } else if (rx_id == DEVICE_SPEAKER_RX_ACDB_ID &&
-                           tx_id == DEVICE_HANDSET_TX_FV5_ACDB_ID) {
+                } else if (((rx_id == DEVICE_SPEAKER_MONO_RX_ACDB_ID )||(rx_id == DEVICE_SPEAKER_STEREO_RX_ACDB_ID))
+                    && tx_id == DEVICE_HANDSET_TX_FV5_ACDB_ID) {
                     tx_id = DEVICE_SPEAKER_TX_FV5_ACDB_ID;
                 }
 

libalsa-intf/msm8960_use_cases.h

diff --git a/libalsa-intf/msm8960_use_cases.h b/libalsa-intf/msm8960_use_cases.h
index b74480b..7e61232 100644
--- a/libalsa-intf/msm8960_use_cases.h
+++ b/libalsa-intf/msm8960_use_cases.h
@@ -44,7 +44,8 @@
 #define CAP_VOICE 0x4
 #define DEVICE_HANDSET_RX_ACDB_ID                       7 // HANDSET_SPKR
 #define DEVICE_HANDSET_TX_ACDB_ID                       4 // HANDSET_MIC
-#define DEVICE_SPEAKER_RX_ACDB_ID                       15// SPKR_PHONE_SPKR_STEREO
+#define DEVICE_SPEAKER_MONO_RX_ACDB_ID                  14// SPKR_PHONE_SPKR_MONO
+#define DEVICE_SPEAKER_STEREO_RX_ACDB_ID                15// SPKR_PHONE_SPKR_STEREO
 #define DEVICE_SPEAKER_TX_ACDB_ID                       11// SPKR_PHONE_MIC
 #define DEVICE_HEADSET_RX_ACDB_ID                       10// HEADSET_SPKR_STEREO
 #define DEVICE_HEADSET_TX_ACDB_ID                       8 // HEADSET_MIC