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.
This commit is contained in:
Tim-Philipp Müller 2008-04-05 12:00:46 +00:00
parent 5a7677ab24
commit 3e9bbb6b64
2 changed files with 11 additions and 1 deletions

View file

@ -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> 2008-04-04 Sebastian Dröge <slomo@circular-chaos.org>
* ext/wavpack/gstwavpackparse.c: * ext/wavpack/gstwavpackparse.c:

View file

@ -115,7 +115,9 @@ gst_hal_get_alsa_element (LibHalContext * ctx, const gchar * udi,
return NULL; 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 /* handle default device specially to use
* dmix, dsnoop, and softvol if appropriate */ * dmix, dsnoop, and softvol if appropriate */
string = g_strdup_printf ("%s device=default:%d", element, card); string = g_strdup_printf ("%s device=default:%d", element, card);
@ -302,6 +304,8 @@ ctx_free:
if (string == NULL) { if (string == NULL) {
GST_WARNING ("Problem finding a HAL audio device for udi %s", udi); GST_WARNING ("Problem finding a HAL audio device for udi %s", udi);
} else {
GST_INFO ("Using %s", string);
} }
return string; return string;