Permalink
Browse files

audio: add support for HDMI and speaker combo device

Bug: 7302453
Change-Id: I732656d185435f0f37437aba0b2f2dd49f65b101
Signed-off-by: Iliyan Malchev <malchev@google.com>
  • Loading branch information...
SathishKumar Mani Iliyan Malchev
SathishKumar Mani authored and Iliyan Malchev committed Oct 4, 2012
1 parent 5062cce commit 9eb1a4fc659f58d196cc8e990da2a3fbf9a1c630
Showing with 4 additions and 0 deletions.
  1. +3 −0 alsa_sound/alsa_default.cpp
  2. +1 −0 libalsa-intf/msm8960_use_cases.h
@@ -1335,6 +1335,9 @@ char *getUCMDevice(uint32_t devices, int input, char *rxDevice)
} 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) ||
@@ -237,6 +237,7 @@ static card_mapping_t card_mapping_list[] = {
#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"

0 comments on commit 9eb1a4f

Please sign in to comment.