mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Lennart Poettering 2009-02-12 04:15:15 +01:00
parent 84666dbc88
commit c3b0d841d1
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/module-hal-detect.c
View file

@ -180,7 +180,7 @@ finish:
static int hal_device_load_alsa(struct userdata *u, const char *udi, struct device *d) { static int hal_device_load_alsa(struct userdata *u, const char *udi, struct device *d) {
enum alsa_type type; enum alsa_type type;
int device, card; int card;
DBusError error; DBusError error;
pa_module *m; pa_module *m;
char *args, *originating_udi = NULL, *card_name = NULL; 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)) if (hal_alsa_device_is_modem(u->context, udi))
goto fail; 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 */ /* 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); originating_udi = libhal_device_get_property_string(u->context, udi, "alsa.originating_device", &error);
if (dbus_error_is_set(&error) || !originating_udi) if (dbus_error_is_set(&error) || !originating_udi)