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

keys: add object.register property

Browse source 
Add a new object.register boolean property.

Make adapter and remote-note only register when object.register
is true.

Make stream and filter not register themselves. They are always
exported to a remote server and thus don't need local
registration.

Fixes #1309
This commit is contained in:
Wim Taymans 2021-06-30 13:49:34 +02:00
parent 2c5d89ff19
commit 324894e605
5 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-adapter.c
View file

@ -168,7 +168,7 @@ static void *create_object(void *_data,
const char *str, *factory_name;
int res;
struct node_data *nd;
bool linger;
bool linger, do_register;
if (properties == NULL)
goto error_properties;
@ -179,6 +179,9 @@ static void *create_object(void *_data,
str = pw_properties_get(properties, PW_KEY_OBJECT_LINGER);
linger = str ? pw_properties_parse_bool(str) : false;
str = pw_properties_get(properties, PW_KEY_OBJECT_REGISTER);
do_register = str ? pw_properties_parse_bool(str) : true;
client = resource ? pw_resource_get_client(resource): NULL;
if (client && !linger) {
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
@ -231,7 +234,10 @@ static void *create_object(void *_data,
pw_impl_node_add_listener(adapter, &nd->adapter_listener, &node_events, nd);
pw_impl_node_register(adapter, NULL);
if (do_register)
pw_impl_node_register(adapter, NULL);
else
pw_impl_node_initialized(adapter);
return adapter;

9
src/modules/module-client-node/remote-node.c
View file

@ -1275,6 +1275,11 @@ struct pw_proxy *pw_core_spa_node_export(struct pw_core *core,
{
struct pw_impl_node *node;
struct pw_proxy *proxy;
const char *str;
bool do_register;
str = props ? spa_dict_lookup(props, PW_KEY_OBJECT_REGISTER) : NULL;
do_register = str ? pw_properties_parse_bool(str) : true;
node = pw_context_create_node(pw_core_get_context(core),
props ? pw_properties_new_dict(props) : NULL, 0);
@ -1282,7 +1287,9 @@ struct pw_proxy *pw_core_spa_node_export(struct pw_core *core,
return NULL;
pw_impl_node_set_implementation(node, (struct spa_node*)object);
pw_impl_node_register(node, NULL);
if (do_register)
pw_impl_node_register(node, NULL);
proxy = node_export(core, node, true, user_data_size);
if (proxy)