mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-12-17 08:56:42 -05:00
hal,udev: deprecate HAL support in favour of udev
This commit is contained in:
parent
8080ab1259
commit
e84644aa88
2 changed files with 5 additions and 4 deletions
|
|
@ -49,11 +49,11 @@ load-module module-augment-properties
|
||||||
#load-module module-pipe-sink
|
#load-module module-pipe-sink
|
||||||
|
|
||||||
### Automatically load driver modules depending on the hardware available
|
### Automatically load driver modules depending on the hardware available
|
||||||
.ifexists module-hal-detect@PA_SOEXT@
|
.ifexists module-udev-detect@PA_SOEXT@
|
||||||
load-module module-hal-detect
|
load-module module-udev-detect
|
||||||
.else
|
.else
|
||||||
### Alternatively use the static hardware detection module (for systems that
|
### Alternatively use the static hardware detection module (for systems that
|
||||||
### lack HAL support)
|
### lack udev support)
|
||||||
load-module module-detect
|
load-module module-detect
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@ PA_MODULE_USAGE("api=<alsa> "
|
||||||
#elif defined(HAVE_OSS)
|
#elif defined(HAVE_OSS)
|
||||||
PA_MODULE_USAGE("api=<oss>");
|
PA_MODULE_USAGE("api=<oss>");
|
||||||
#endif
|
#endif
|
||||||
|
PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-hal-detect!");
|
||||||
|
|
||||||
struct device {
|
struct device {
|
||||||
char *udi, *originating_udi;
|
char *udi, *originating_udi;
|
||||||
|
|
@ -232,7 +233,7 @@ static int hal_device_load_alsa(struct userdata *u, const char *udi, struct devi
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
card_name = pa_sprintf_malloc("alsa_card.%s", strip_udi(originating_udi));
|
card_name = pa_sprintf_malloc("alsa_card.%s", strip_udi(originating_udi));
|
||||||
args = pa_sprintf_malloc("device_id=%u name=%s card_name=%s tsched=%i", card, strip_udi(originating_udi), card_name, (int) u->use_tsched);
|
args = pa_sprintf_malloc("device_id=%u name=\"%s\" card_name=\"%s\" tsched=%i card_properties=\"module-hal-detect.discovered=1\"", card, strip_udi(originating_udi), card_name, (int) u->use_tsched);
|
||||||
|
|
||||||
pa_log_debug("Loading module-alsa-card with arguments '%s'", args);
|
pa_log_debug("Loading module-alsa-card with arguments '%s'", args);
|
||||||
m = pa_module_load(u->core, "module-alsa-card", args);
|
m = pa_module_load(u->core, "module-alsa-card", args);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue