diff options
| author | Giulio Cervera <giulio.cervera@gmail.com> | 2012-05-30 22:07:59 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-05-30 22:07:59 +0400 |
| commit | bab72b92f3f1d806ae1306e99cc2ff0570053660 (patch) | |
| tree | 94d7da06c1b0d1ef7ade15145a15fae12890a6bb | |
| parent | e0d4e0a3c4c612165267b1970a58a70fe9e5c547 (diff) | |
| parent | 523c9306b1af43c62679df6c1f53445bab752fd7 (diff) | |
| download | android_hardware_qcom_media-bab72b92f3f1d806ae1306e99cc2ff0570053660.tar.gz android_hardware_qcom_media-bab72b92f3f1d806ae1306e99cc2ff0570053660.tar.bz2 android_hardware_qcom_media-bab72b92f3f1d806ae1306e99cc2ff0570053660.zip | |
Merge "msm7x30: fix for SEMC devices with stereo hw speaker" into ics
| -rw-r--r-- | audio/msm7x30/Android.mk | 4 | ||||
| -rw-r--r-- | audio/msm7x30/AudioHardware.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/audio/msm7x30/Android.mk b/audio/msm7x30/Android.mk index 4956c311..4cd3e776 100644 --- a/audio/msm7x30/Android.mk +++ b/audio/msm7x30/Android.mk @@ -31,6 +31,10 @@ ifeq ($(BOARD_USES_QCOM_AUDIO_RESETALL),true) LOCAL_CFLAGS += -DWITH_QCOM_RESETALL endif +ifeq ($(BOARD_USES_STEREO_HW_SPEAKER),true) + LOCAL_CFLAGS += -DWITH_STEREO_HW_SPEAKER +endif + LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ diff --git a/audio/msm7x30/AudioHardware.cpp b/audio/msm7x30/AudioHardware.cpp index 7b650808..4474500b 100644 --- a/audio/msm7x30/AudioHardware.cpp +++ b/audio/msm7x30/AudioHardware.cpp @@ -593,7 +593,9 @@ AudioHardware::AudioHardware() : (strcmp((char*)name[i], "handset_voice_tx") == 0)) index = DEVICE_HANDSET_TX; else if((strcmp((char* )name[i],"speaker_stereo_rx") == 0) || +#ifndef WITH_STEREO_HW_SPEAKER (strcmp((char* )name[i],"speaker_mono_rx") == 0) || +#endif (strcmp((char* )name[i],"speaker_rx") == 0) || (strcmp((char*)name[i], "speaker_stereo_audio_rx") == 0)) index = DEVICE_SPEAKER_RX; |