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

Make sure we bind before registering the global

Browse source 
Bind to the resource in create_object before we register the global.
This ensure a client gets to see the resource global id associated
with the resource before it appears in the registry, which makes it
easier to patch the local proxy to the global object.
This commit is contained in:
Wim Taymans 2019-11-25 16:31:30 +01:00
parent b7c5e00697
commit 8acae9db7d
3 changed files with 88 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,9 @@ struct node_data {
struct pw_node *adapter;
struct pw_node *slave;
struct spa_hook adapter_listener;
struct pw_resource *resource;
struct spa_hook resource_listener;
uint32_t new_id;
};
static void resource_destroy(void *data)
@ -96,10 +98,42 @@ static void node_free(void *data)
pw_node_destroy(nd->slave);
}
static void node_initialized(void *data)
{
struct node_data *nd = data;
struct pw_client *client;
struct pw_resource *bound_resource;
struct pw_global *global;
int res;
if (nd->resource == NULL)
return;
client = pw_resource_get_client(nd->resource);
global = pw_node_get_global(nd->adapter);
res = pw_global_bind(global, client,
PW_PERM_RWX, PW_VERSION_NODE_PROXY, nd->new_id);
if (res < 0)
goto error_bind;
if ((bound_resource = pw_client_find_resource(client, nd->new_id)) == NULL)
goto error_bind;
pw_resource_add_listener(bound_resource, &nd->resource_listener, &resource_events, nd);
return;
error_bind:
pw_resource_error(nd->resource, res, "can't bind adapter node");
return;
}
static const struct pw_node_events node_events = {
PW_VERSION_NODE_EVENTS,
.destroy = node_destroy,
.free = node_free,
.initialized = node_initialized,
};
static void *create_object(void *_data,
@ -167,26 +201,14 @@ static void *create_object(void *_data,
nd->data = d;
nd->adapter = adapter;
nd->slave = slave;
nd->resource = resource;
nd->new_id = new_id;
spa_list_append(&d->node_list, &nd->link);
pw_node_add_listener(adapter, &nd->adapter_listener, &node_events, nd);
pw_node_register(adapter, NULL);
if (client) {
struct pw_resource *bound_resource;
res = pw_global_bind(pw_node_get_global(adapter), client,
PW_PERM_RWX, PW_VERSION_NODE_PROXY, new_id);
if (res < 0)
goto error_bind;
if ((bound_resource = pw_client_find_resource(client, new_id)) == NULL)
goto error_bind;
pw_resource_add_listener(bound_resource, &nd->resource_listener, &resource_events, nd);
}
pw_node_set_active(adapter, true);
return adapter;
@ -209,10 +231,6 @@ error_usage:
if (resource)
pw_resource_error(resource, res, "usage: "ADAPTER_USAGE);
goto error_cleanup;
error_bind:
if (resource)
pw_resource_error(resource, res, "can't bind adapter node");
goto error_cleanup;
error_cleanup:
if (properties)
pw_properties_free(properties);