Sun, 08 May 2011 15:46:25 +0200
Import package vendor original specs for necessary manipulations.
1 Index: src/modules/module-hal-detect.c
2 --- src/modules/module-hal-detect.c.orig 2009-01-13 00:10:34.000000000 +0100
3 +++ src/modules/module-hal-detect.c 2009-02-21 11:44:42.227221959 +0100
4 @@ -183,7 +183,7 @@
5 goto fail;
7 device = libhal_device_get_property_int(u->context, udi, "alsa.device", &error);
8 - if (dbus_error_is_set(&error) || device != 0)
9 + if (dbus_error_is_set(&error))
10 goto fail;
12 card = libhal_device_get_property_int(u->context, udi, "alsa.card", &error);
13 @@ -197,12 +197,12 @@
14 *sink_name = pa_sprintf_malloc("alsa_output.%s", strip_udi(udi));
16 module_name = "module-alsa-sink";
17 - args = pa_sprintf_malloc("device_id=%u sink_name=%s tsched=%i", card, *sink_name, (int) u->use_tsched);
18 + args = pa_sprintf_malloc("device_id=%u,%u sink_name=%s tsched=%i", card, device, *sink_name, (int) u->use_tsched);
19 } else {
20 *source_name = pa_sprintf_malloc("alsa_input.%s", strip_udi(udi));
22 module_name = "module-alsa-source";
23 - args = pa_sprintf_malloc("device_id=%u source_name=%s tsched=%i", card, *source_name, (int) u->use_tsched);
24 + args = pa_sprintf_malloc("device_id=%u,%u source_name=%s tsched=%i", card, device, *source_name, (int) u->use_tsched);
25 }
27 pa_log_debug("Loading %s with arguments '%s'", module_name, args);