From 3e9bbb6b6497b96cff759be19cd0ee1b479421e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sat, 5 Apr 2008 12:00:46 +0000
Subject: [PATCH] ext/hal/hal.c: Don't munge device string to 'default:x' for
 capture devices.

Original commit message from CVS:
* ext/hal/hal.c: (gst_hal_get_alsa_element):
Don't munge device string to 'default:x' for capture devices.
Fixes #525833.
---
 ChangeLog     | 6 ++++++
 ext/hal/hal.c | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a20064c042..51cc0e7b26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-05  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/hal/hal.c: (gst_hal_get_alsa_element):
+	  Don't munge device string to 'default:x' for capture devices.
+	  Fixes #525833.
+
 2008-04-04  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* ext/wavpack/gstwavpackparse.c:
diff --git a/ext/hal/hal.c b/ext/hal/hal.c
index 6858aeae0d..d23a91a677 100644
--- a/ext/hal/hal.c
+++ b/ext/hal/hal.c
@@ -115,7 +115,9 @@ gst_hal_get_alsa_element (LibHalContext * ctx, const gchar * udi,
       return NULL;
     }
 
-    if (device == 0) {
+    /* This is a bit dodgy, since it makes lots of assumptions about the way
+     * alsa is set up. In any case, only munge the device string for playback */
+    if (strcmp (element, "alsasink") == 0 && device == 0) {
       /* handle default device specially to use
        * dmix, dsnoop, and softvol if appropriate */
       string = g_strdup_printf ("%s device=default:%d", element, card);
@@ -302,6 +304,8 @@ ctx_free:
 
   if (string == NULL) {
     GST_WARNING ("Problem finding a HAL audio device for udi %s", udi);
+  } else {
+    GST_INFO ("Using %s", string);
   }
 
   return string;