mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2026-05-26 21:38:23 -04:00
modules: avoid useless props copy
We can use the properties we passed to the node.
This commit is contained in:
parent
c8b9b44d40
commit
3db8038652
1 changed files with 5 additions and 6 deletions
|
|
@ -115,7 +115,7 @@ static const struct pw_proxy_events core_proxy_events = {
|
||||||
.removed = core_removed,
|
.removed = core_removed,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int export_node(struct node_data *nd, struct pw_properties *props)
|
static int export_node(struct node_data *nd, const struct pw_properties *props)
|
||||||
{
|
{
|
||||||
const char *str;
|
const char *str;
|
||||||
|
|
||||||
|
|
@ -200,7 +200,7 @@ static void *create_object(void *_data,
|
||||||
int res;
|
int res;
|
||||||
struct pw_impl_client *client;
|
struct pw_impl_client *client;
|
||||||
bool linger;
|
bool linger;
|
||||||
spa_autoptr(pw_properties) copy = NULL;
|
const struct pw_properties *p;
|
||||||
|
|
||||||
if (properties == NULL)
|
if (properties == NULL)
|
||||||
goto error_properties;
|
goto error_properties;
|
||||||
|
|
@ -220,8 +220,6 @@ static void *create_object(void *_data,
|
||||||
pw_global_get_id(pw_impl_client_get_global(client)));
|
pw_global_get_id(pw_impl_client_get_global(client)));
|
||||||
}
|
}
|
||||||
|
|
||||||
copy = pw_properties_copy(properties);
|
|
||||||
|
|
||||||
node = pw_spa_node_load(context,
|
node = pw_spa_node_load(context,
|
||||||
factory_name,
|
factory_name,
|
||||||
PW_SPA_NODE_FLAG_ACTIVATE,
|
PW_SPA_NODE_FLAG_ACTIVATE,
|
||||||
|
|
@ -249,8 +247,9 @@ static void *create_object(void *_data,
|
||||||
|
|
||||||
pw_resource_add_listener(nd->resource, &nd->resource_listener, &resource_events, nd);
|
pw_resource_add_listener(nd->resource, &nd->resource_listener, &resource_events, nd);
|
||||||
}
|
}
|
||||||
if (pw_properties_get_bool(copy, PW_KEY_OBJECT_EXPORT, false)) {
|
p = pw_impl_node_get_properties(node);
|
||||||
res = export_node(nd, copy);
|
if (pw_properties_get_bool(p, PW_KEY_OBJECT_EXPORT, false)) {
|
||||||
|
res = export_node(nd, p);
|
||||||
if (res < 0)
|
if (res < 0)
|
||||||
goto error_export;
|
goto error_export;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue