diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2011-11-15 13:28:48 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2011-11-15 13:30:00 +0530 |
| commit | 82ddc54728f9450b1e3035327437115c7db99e3c (patch) | |
| tree | 52fee0263184dfac9498551b0afae60f601d6335 | |
| parent | b6d942d796ac6cea75bed0e19efc4dd765543cb0 (diff) | |
| download | pandaboard-linaro_android_2.3.5_tracking.tar.gz | |
Revert "audio: playback on hdmi"linaro_android_2.3.5_tracking
This reverts commit b6d942d796ac6cea75bed0e19efc4dd765543cb0.
Since audio playback on hdmi is broken on 3.1 kernel for tracking-panda
builds.
Change-Id: Icb626daa8a0097f502c5b4401e81c6cea16adc48
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | modules/alsa/alsa_omap4.cpp | 12 |
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) |