[pulseaudio-commits] r1434 - /trunk/src/modules/module-hal-detect.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Tue Mar  6 14:31:29 2007
New Revision: 1434

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1434&root=3Dpulseaudio&vi=
ew=3Drev
Log:
Don't fail if hal doesn't currently contain any devices. (closes #55)

Modified:
    trunk/src/modules/module-hal-detect.c

Modified: trunk/src/modules/module-hal-detect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-hal-de=
tect.c?rev=3D1434&root=3Dpulseaudio&r1=3D1433&r2=3D1434&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-hal-detect.c (original)
+++ trunk/src/modules/module-hal-detect.c Tue Mar  6 14:31:29 2007
@@ -488,7 +488,6 @@
 }
 =

 int pa__init(pa_core *c, pa_module*m) {
-    int n;
     DBusError error;
     pa_dbus_connection *conn;
     struct userdata *u =3D NULL;
@@ -519,16 +518,11 @@
     m->userdata =3D (void*) u;
 =

 #ifdef HAVE_ALSA
-    if ((n =3D hal_device_add_all(u, CAP_ALSA)) <=3D 0)
+    hal_device_add_all(u, CAP_ALSA);
 #endif
 #ifdef HAVE_OSS
-    if ((n =3D hal_device_add_all(u, CAP_OSS)) <=3D 0)
-#endif
-    {
-        pa_log_warn("failed to detect any sound hardware.");
-        userdata_free(u);
-        return -1;
-    }
+    hal_device_add_all(u, CAP_OSS);
+#endif
 =

     libhal_ctx_set_user_data(hal_ctx, (void*) u);
     libhal_ctx_set_device_added(hal_ctx, device_added_cb);