mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't fail if hal doesn't currently contain any devices. (closes #55)

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1434 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2007-03-06 13:31:29 +00:00
parent 2b82336df2
commit 0b14c02689
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -488,7 +488,6 @@ fail:
} }
int pa__init(pa_core *c, pa_module*m) { int pa__init(pa_core *c, pa_module*m) {
int n;
DBusError error; DBusError error;
pa_dbus_connection *conn; pa_dbus_connection *conn;
struct userdata *u = NULL; struct userdata *u = NULL;
@ -519,16 +518,11 @@ int pa__init(pa_core *c, pa_module*m) {
m->userdata = (void*) u; m->userdata = (void*) u;
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
if ((n = hal_device_add_all(u, CAP_ALSA)) <= 0) hal_device_add_all(u, CAP_ALSA);
#endif #endif
#ifdef HAVE_OSS #ifdef HAVE_OSS
if ((n = hal_device_add_all(u, CAP_OSS)) <= 0) hal_device_add_all(u, CAP_OSS);
#endif #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_user_data(hal_ctx, (void*) u);
libhal_ctx_set_device_added(hal_ctx, device_added_cb); libhal_ctx_set_device_added(hal_ctx, device_added_cb);