commit 8190752da6481f7c8948962d6fb805a0363ce652
author SathishKumar Mani <smani@codeaurora.org> Wed Oct 17 12:43:16 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 17 12:43:16 2012 -0700
tree 848215b7a99366aba1896b2e7bc2357f97ac00c9
parent 80293eb3d4663e542507cfad8cef9201131fda10
parent c26e258cea80ab7197e527d06097cd6999df49a9

am c26e258c: am 9eb1a4fc: audio: add support for HDMI and speaker combo device

* commit 'c26e258cea80ab7197e527d06097cd6999df49a9':
  audio: add support for HDMI and speaker combo device

alsa_sound/alsa_default.cpp

diff --git a/alsa_sound/alsa_default.cpp b/alsa_sound/alsa_default.cpp
index 316921d..7c2449e 100644
--- a/alsa_sound/alsa_default.cpp
+++ b/alsa_sound/alsa_default.cpp
@@ -1335,6 +1335,9 @@
             } else {
                 return strdup(SND_USE_CASE_DEV_SPEAKER_HEADSET); /* COMBO SPEAKER+HEADSET RX */
             }
+        } else if ((devices & AudioSystem::DEVICE_OUT_SPEAKER) &&
+            ((devices & AudioSystem::DEVICE_OUT_AUX_DIGITAL))) {
+            return strdup(SND_USE_CASE_DEV_HDMI_SPEAKER);
 #ifdef QCOM_ANC_HEADSET_ENABLED
         } else if ((devices & AudioSystem::DEVICE_OUT_SPEAKER) &&
             ((devices & AudioSystem::DEVICE_OUT_ANC_HEADSET) ||

libalsa-intf/msm8960_use_cases.h

diff --git a/libalsa-intf/msm8960_use_cases.h b/libalsa-intf/msm8960_use_cases.h
index ad69e09..ed58d8a 100644
--- a/libalsa-intf/msm8960_use_cases.h
+++ b/libalsa-intf/msm8960_use_cases.h
@@ -237,6 +237,7 @@
 #define SND_USE_CASE_DEV_SSR_QUAD_MIC "SSR QMIC"
 #define SND_USE_CASE_DEV_PROXY_RX     "PROXY Rx"
 #define SND_USE_CASE_DEV_PROXY_TX     "PROXY Tx"
+#define SND_USE_CASE_DEV_HDMI_SPEAKER     "HDMI Speaker"
 #define SND_USE_CASE_DEV_SPDIF_SPEAKER     "SPDIF Speaker"
 #define SND_USE_CASE_DEV_SPDIF_HANDSET     "SPDIF Earpiece"
 #define SND_USE_CASE_DEV_SPDIF_HEADSET     "SPDIF Headphones"