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

Fix build and only load OSS xor ALSA modules if both are available

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1440 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-05-22 23:38:22 +00:00
parent e41b91eec9
commit 960b5cbd10
1 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,6 +85,9 @@ struct userdata {
capability_t capability; capability_t capability;
pa_dbus_connection *conn; pa_dbus_connection *conn;
pa_hashmap *devices; pa_hashmap *devices;
#if defined(HAVE_ALSA) && defined(HAVE_OSS)
int use_oss;
#endif
}; };
struct timerdata { struct timerdata {
@ -185,6 +188,8 @@ static pa_module* hal_device_load_alsa(struct userdata *u, const char *udi,
snprintf(args, sizeof(args), "device=hw:%u source_name=alsa_input.%s", card, strip_udi(udi)); snprintf(args, sizeof(args), "device=hw:%u source_name=alsa_input.%s", card, strip_udi(udi));
} }
pa_log_debug("Loading %s with arguments '%s'", module_name, args);
return pa_module_load(u->core, module_name, args); return pa_module_load(u->core, module_name, args);
} }
@ -242,6 +247,8 @@ static pa_module* hal_device_load_oss(struct userdata *u, const char *udi,
snprintf(args, sizeof(args), "device=%s sink_name=oss_output.%s source_name=oss_input.%s", device, strip_udi(udi), strip_udi(udi)); snprintf(args, sizeof(args), "device=%s sink_name=oss_output.%s source_name=oss_input.%s", device, strip_udi(udi), strip_udi(udi));
libhal_free_string(device); libhal_free_string(device);
pa_log_debug("Loading module-oss with arguments '%s'", args);
return pa_module_load(u->core, "module-oss", args); return pa_module_load(u->core, "module-oss", args);
} }
#endif #endif
@ -249,7 +256,7 @@ static pa_module* hal_device_load_oss(struct userdata *u, const char *udi,
static dbus_bool_t hal_device_add(struct userdata *u, const char *udi, static dbus_bool_t hal_device_add(struct userdata *u, const char *udi,
DBusError *error) DBusError *error)
{ {
pa_module* m; pa_module* m = NULL;
struct device *d; struct device *d;
switch(u->capability) { switch(u->capability) {
@ -260,7 +267,10 @@ static dbus_bool_t hal_device_add(struct userdata *u, const char *udi,
#endif #endif
#ifdef HAVE_OSS #ifdef HAVE_OSS
case CAP_OSS: case CAP_OSS:
m = hal_device_load_oss(u, udi, error); #ifdef HAVE_ALSA
if (u->use_oss)
#endif
m = hal_device_load_oss(u, udi, error);
break; break;
#endif #endif
default: default:
@ -492,6 +502,7 @@ int pa__init(pa_core *c, pa_module*m) {
pa_dbus_connection *conn; pa_dbus_connection *conn;
struct userdata *u = NULL; struct userdata *u = NULL;
LibHalContext *hal_ctx = NULL; LibHalContext *hal_ctx = NULL;
int n = 0;
assert(c); assert(c);
assert(m); assert(m);
@ -518,13 +529,26 @@ int pa__init(pa_core *c, pa_module*m) {
m->userdata = (void*) u; m->userdata = (void*) u;
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
hal_device_add_all(u, CAP_ALSA); n = hal_device_add_all(u, CAP_ALSA);
#endif #endif
#if defined(HAVE_ALSA) && defined(HAVE_OSS)
u->use_oss = 0;
if (n <= 0) {
#endif
#ifdef HAVE_OSS #ifdef HAVE_OSS
hal_device_add_all(u, CAP_OSS); n += hal_device_add_all(u, CAP_OSS);
#endif #endif
#if defined(HAVE_ALSA) && defined(HAVE_OSS)
libhal_ctx_set_user_data(hal_ctx, (void*) u); /* We found something with OSS, but didn't find anything with
* ALSA. Then let's use only OSS from now on. */
if (n > 0)
u->use_oss = 1;
}
#endif
libhal_ctx_set_user_data(hal_ctx, u);
libhal_ctx_set_device_added(hal_ctx, device_added_cb); libhal_ctx_set_device_added(hal_ctx, device_added_cb);
libhal_ctx_set_device_removed(hal_ctx, device_removed_cb); libhal_ctx_set_device_removed(hal_ctx, device_removed_cb);
libhal_ctx_set_device_new_capability(hal_ctx, new_capability_cb); libhal_ctx_set_device_new_capability(hal_ctx, new_capability_cb);