mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-link-factory: ignore link.passive by default

Browse source 
Make an option to allow link.passive properties and set it to false by
default.

This effectively ignores the link.passive properties from the session
manager, jack clients and pw-link when set. This is a good idea because
the logic for making passive links is better handled in the core.
This commit is contained in:
Wim Taymans 2023-03-28 13:32:08 +02:00
parent 67999f0f9c
commit 93e6e98a17
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/minimal.conf.in
View file

@ -326,7 +326,6 @@ context.objects = [
# link.output.port = capture_1
# link.input.node = my-mic
# link.input.port = input_FL
# link.passive = true
# }
#}
#{ factory = link-factory
@ -335,7 +334,6 @@ context.objects = [
# link.output.port = capture_2
# link.input.node = my-mic
# link.input.port = input_FR
# link.passive = true
# }
#}
]

16
src/modules/module-link-factory.c
View file

@ -29,15 +29,22 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
"("PW_KEY_OBJECT_LINGER"=<bool>) " \
"("PW_KEY_LINK_PASSIVE"=<bool>)"
#define MODULE_USAGE "( allow.link.passive=<bool, default false> ) "
static const struct spa_dict_item module_props[] = {
{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
{ PW_KEY_MODULE_DESCRIPTION, "Allow clients to create links" },
{ PW_KEY_MODULE_USAGE, MODULE_USAGE },
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
};
struct factory_data {
struct pw_context *context;
struct pw_properties *props;
unsigned int allow_passive:1;
struct pw_impl_module *module;
struct spa_hook module_listener;
@ -396,6 +403,8 @@ static void *create_object(void *_data,
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_impl_client_get_info(client)->id);
if (!d->allow_passive)
pw_properties_set(properties, PW_KEY_LINK_PASSIVE, NULL);
link = pw_context_create_link(context, outport, inport, NULL, properties, sizeof(struct link_data));
properties = NULL;
@ -462,6 +471,7 @@ static void factory_destroy(void *data)
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
pw_properties_free(d->props);
}
static const struct pw_impl_factory_events factory_events = {
@ -527,6 +537,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
data->module = module;
data->context = context;
data->work = pw_context_get_work_queue(context);
data->props = args ? pw_properties_new_string(args) : NULL;
if (data->props) {
data->allow_passive = pw_properties_get_bool(data->props,
"allow.link.passive", false);
}
spa_list_init(&data->link_list);