From 62509f23d7476781b8936a61cfebc229b787efc0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 8 Nov 2021 12:21:31 +0100 Subject: [PATCH] impl-core: pass data to listener user_data So that we can get to the registry resource. --- src/pipewire/impl-core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pipewire/impl-core.c b/src/pipewire/impl-core.c index 9545fdae0..a0b70cd86 100644 --- a/src/pipewire/impl-core.c +++ b/src/pipewire/impl-core.c @@ -71,7 +71,8 @@ struct resource_data { static void * registry_bind(void *object, uint32_t id, const char *type, uint32_t version, size_t user_data_size) { - struct pw_resource *resource = object; + struct resource_data *data = object; + struct pw_resource *resource = data->resource; struct pw_impl_client *client = resource->client; struct pw_context *context = resource->context; struct pw_global *global; @@ -115,7 +116,8 @@ error_exit_clean: static int registry_destroy(void *object, uint32_t id) { - struct pw_resource *resource = object; + struct resource_data *data = object; + struct pw_resource *resource = data->resource; struct pw_impl_client *client = resource->client; struct pw_context *context = resource->context; struct pw_global *global; @@ -278,7 +280,7 @@ static struct pw_registry *core_get_registry(void *object, uint32_t version, siz pw_resource_add_object_listener(registry_resource, &data->object_listener, ®istry_methods, - resource); + data); spa_list_append(&context->registry_resource_list, ®istry_resource->link);