Sat, 21 Feb 2009 16:34:22 +0100
Import custom package specs to build for undistributed platforms.
This allows installation of pulseaudio and its dependencies on some
operating systems not providing it in default package repositories.
michael@6 | 1 | Index: src/modules/module-hal-detect.c |
michael@6 | 2 | --- src/modules/module-hal-detect.c.orig 2009-01-13 00:10:34.000000000 +0100 |
michael@6 | 3 | +++ src/modules/module-hal-detect.c 2009-02-21 11:44:42.227221959 +0100 |
michael@6 | 4 | @@ -183,7 +183,7 @@ |
michael@6 | 5 | goto fail; |
michael@6 | 6 | |
michael@6 | 7 | device = libhal_device_get_property_int(u->context, udi, "alsa.device", &error); |
michael@6 | 8 | - if (dbus_error_is_set(&error) || device != 0) |
michael@6 | 9 | + if (dbus_error_is_set(&error)) |
michael@6 | 10 | goto fail; |
michael@6 | 11 | |
michael@6 | 12 | card = libhal_device_get_property_int(u->context, udi, "alsa.card", &error); |
michael@6 | 13 | @@ -197,12 +197,12 @@ |
michael@6 | 14 | *sink_name = pa_sprintf_malloc("alsa_output.%s", strip_udi(udi)); |
michael@6 | 15 | |
michael@6 | 16 | module_name = "module-alsa-sink"; |
michael@6 | 17 | - args = pa_sprintf_malloc("device_id=%u sink_name=%s tsched=%i", card, *sink_name, (int) u->use_tsched); |
michael@6 | 18 | + args = pa_sprintf_malloc("device_id=%u,%u sink_name=%s tsched=%i", card, device, *sink_name, (int) u->use_tsched); |
michael@6 | 19 | } else { |
michael@6 | 20 | *source_name = pa_sprintf_malloc("alsa_input.%s", strip_udi(udi)); |
michael@6 | 21 | |
michael@6 | 22 | module_name = "module-alsa-source"; |
michael@6 | 23 | - args = pa_sprintf_malloc("device_id=%u source_name=%s tsched=%i", card, *source_name, (int) u->use_tsched); |
michael@6 | 24 | + args = pa_sprintf_malloc("device_id=%u,%u source_name=%s tsched=%i", card, device, *source_name, (int) u->use_tsched); |
michael@6 | 25 | } |
michael@6 | 26 | |
michael@6 | 27 | pa_log_debug("Loading %s with arguments '%s'", module_name, args); |