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

jackdbus-detect: Make it possible to disable sink or source

Browse source 
In some cases you might not want to enable the autogenerated sink or
source because you only have a need for the other. An argument was
added that is checked before the module-jack-{source,sink} is loaded.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/668>
This commit is contained in:
Mathy Vanvoorden 2021-12-09 13:49:52 +01:00
parent 484b69863f
commit cc8df06b9d
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/jack/module-jackdbus-detect.c
View file

@ -71,11 +71,13 @@ PA_MODULE_USAGE(
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"channels", "channels",
"sink_enabled",
"sink_name", "sink_name",
"sink_properties", "sink_properties",
"sink_client_name", "sink_client_name",
"sink_channels", "sink_channels",
"sink_channel_map", "sink_channel_map",
"source_enabled",
"source_name", "source_name",
"source_properties", "source_properties",
"source_client_name", "source_client_name",
@ -100,6 +102,7 @@ static const char* const modtypes[JACK_SS_COUNT] = {
}; };
struct moddata { struct moddata {
bool enabled;
char *name; char *name;
pa_proplist *proplist; pa_proplist *proplist;
char *client_name; char *client_name;
@ -178,7 +181,7 @@ static void ensure_ports_started(struct userdata* u) {
pa_assert(u); pa_assert(u);
for (i = 0; i < JACK_SS_COUNT; i++) for (i = 0; i < JACK_SS_COUNT; i++)
if (!u->jack_module_index[i]) { if (u->mod_args[i].enabled && !u->jack_module_index[i]) {
pa_strbuf *args_buf = pa_strbuf_new(); pa_strbuf *args_buf = pa_strbuf_new();
char *args; char *args;
pa_module *m; pa_module *m;
@ -340,6 +343,13 @@ int pa__init(pa_module *m) {
} }
for (i = 0; i < JACK_SS_COUNT; i++) { for (i = 0; i < JACK_SS_COUNT; i++) {
u->mod_args[i].enabled = true;
pa_snprintf(argname, sizeof(argname), "%s_enabled", modtypes[i]);
if (pa_modargs_get_value_boolean(ma, argname, &u->mod_args[i].enabled) < 0) {
pa_log("Failed to parse %s= argument.", argname);
goto fail;
}
pa_snprintf(argname, sizeof(argname), "%s_name", modtypes[i]); pa_snprintf(argname, sizeof(argname), "%s_name", modtypes[i]);
name = pa_modargs_get_value(ma, argname, NULL); name = pa_modargs_get_value(ma, argname, NULL);
u->mod_args[i].name = pa_xstrdup(name); u->mod_args[i].name = pa_xstrdup(name);