summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2011-11-21 19:19:17 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2011-11-21 19:32:08 +0530
commit312bd812141d16a20a062d800f2d90d5f1174de7 (patch)
tree52fee0263184dfac9498551b0afae60f601d6335
parentb6d942d796ac6cea75bed0e19efc4dd765543cb0 (diff)
downloadpandaboard-linaro_android_2.3.7.tar.gz
Revert "audio: playback on hdmi"linaro_android_2.3.7
This reverts commit b6d942d796ac6cea75bed0e19efc4dd765543cb0. Audio on hdmi is broken on tilt-android-3.1 Change-Id: I33087a6dcc9a9dc08fe98a45c487eb4fa0742532 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--modules/alsa/alsa_omap4.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/modules/alsa/alsa_omap4.cpp b/modules/alsa/alsa_omap4.cpp
index 54e2bfb..329b9ec 100644
--- a/modules/alsa/alsa_omap4.cpp
+++ b/modules/alsa/alsa_omap4.cpp
@@ -33,8 +33,7 @@
#define ALSA_DEFAULT_SAMPLE_RATE 44100 // in Hz
#endif
-#define DEFAULT_OUT_DEVICE "plughw:1,0"
-#define DEFAULT_IN_DEVICE "plughw:0,0"
+#define DEFAULT_DEVICE "plughw:0,0"
namespace android
{
@@ -160,14 +159,7 @@ const char *deviceName(alsa_handle_t *handle, uint32_t device, int mode)
{
static char devString[ALSA_NAME_MAX];
int hasDevExt = 0;
- if (device & 0x0000FFFF) {
- LOGD("Output Device");
- return DEFAULT_OUT_DEVICE;
- }
- else {
- LOGD("Input Device");
- return DEFAULT_IN_DEVICE;
- }
+ return DEFAULT_DEVICE;
}
const char *streamName(alsa_handle_t *handle)