[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test1-39-gc3b0d84

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  84666dbc88d6ace253bd4c5839dcde127ca02100 (commit)

- Log -----------------------------------------------------------------
c3b0d84... make module-hal-detect pick up all cards even when they have no device 0
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-hal-detect.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------

commit c3b0d841d19898cd268a65173b6c0ca5f88a64c7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Feb 12 04:15:15 2009 +0100

    make module-hal-detect pick up all cards even when they have no device 0

diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c
index 8b1f0b2..e603738 100644
--- a/src/modules/module-hal-detect.c
+++ b/src/modules/module-hal-detect.c
@@ -180,7 +180,7 @@ finish:
 
 static int hal_device_load_alsa(struct userdata *u, const char *udi, struct device *d) {
     enum alsa_type type;
-    int device, card;
+    int card;
     DBusError error;
     pa_module *m;
     char *args, *originating_udi = NULL, *card_name = NULL;
@@ -200,11 +200,6 @@ static int hal_device_load_alsa(struct userdata *u, const char *udi, struct devi
     if (hal_alsa_device_is_modem(u->context, udi))
         goto fail;
 
-    /* We only care for the main device */
-    device = libhal_device_get_property_int(u->context, udi, "alsa.device", &error);
-    if (dbus_error_is_set(&error) || device != 0)
-        goto fail;
-
     /* We store only one entry per card, hence we look for the originating device */
     originating_udi = libhal_device_get_property_string(u->context, udi, "alsa.originating_device", &error);
     if (dbus_error_is_set(&error) || !originating_udi)

-- 
hooks/post-receive
PulseAudio Sound Server