From 0b14c026890ee6806971d179a66aee5b03e1d763 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 6 Mar 2007 13:31:29 +0000 Subject: Don't fail if hal doesn't currently contain any devices. (closes #55) git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1434 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/modules/module-hal-detect.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index 56a3efc1..a28b6f0d 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -488,7 +488,6 @@ fail: } int pa__init(pa_core *c, pa_module*m) { - int n; DBusError error; pa_dbus_connection *conn; struct userdata *u = NULL; @@ -519,16 +518,11 @@ int pa__init(pa_core *c, pa_module*m) { m->userdata = (void*) u; #ifdef HAVE_ALSA - if ((n = hal_device_add_all(u, CAP_ALSA)) <= 0) + hal_device_add_all(u, CAP_ALSA); #endif #ifdef HAVE_OSS - if ((n = hal_device_add_all(u, CAP_OSS)) <= 0) + hal_device_add_all(u, CAP_OSS); #endif - { - pa_log_warn("failed to detect any sound hardware."); - userdata_free(u); - return -1; - } libhal_ctx_set_user_data(hal_ctx, (void*) u); libhal_ctx_set_device_added(hal_ctx, device_added_cb); -- cgit