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

metadata: fix cleanup

Browse source 
When the global is destroyed, free the resource.
When the resource is freed, destroy the global.
Make sure any bound resources are freed when the global is destroyed
by calling pw_global_add_resource().
This commit is contained in:
Wim Taymans 2020-03-02 10:49:04 +01:00
parent 77cc58ba71
commit 847ee8f064
1 changed files with 40 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/modules/module-metadata/metadata.c
View file

@ -28,6 +28,7 @@
struct impl { struct impl {
struct pw_global *global; struct pw_global *global;
struct spa_hook global_listener;
struct pw_metadata *metadata; struct pw_metadata *metadata;
struct pw_resource *resource; struct pw_resource *resource;
@ -123,6 +124,8 @@ global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions,
data->impl = impl; data->impl = impl;
data->resource = resource; data->resource = resource;
pw_global_add_resource(impl->global, resource);
/* listen for when the resource goes away */ /* listen for when the resource goes away */
pw_resource_add_listener(resource, pw_resource_add_listener(resource,
&data->resource_listener, &data->resource_listener,
@ -140,6 +143,35 @@ global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions,
return 0; return 0;
} }
static void global_destroy(void *data)
{
struct impl *impl = data;
spa_hook_remove(&impl->global_listener);
impl->global = NULL;
if (impl->resource)
pw_resource_destroy(impl->resource);
}
static const struct pw_global_events global_events = {
PW_VERSION_GLOBAL_EVENTS,
.destroy = global_destroy,
};
static void global_resource_destroy(void *data)
{
struct impl *impl = data;
spa_hook_remove(&impl->resource_listener);
impl->resource = NULL;
impl->metadata = NULL;
if (impl->global)
pw_global_destroy(impl->global);
}
static const struct pw_resource_events global_resource_events = {
PW_VERSION_RESOURCE_EVENTS,
.destroy = global_resource_destroy,
};
void * void *
pw_metadata_new(struct pw_context *context, struct pw_resource *resource, pw_metadata_new(struct pw_context *context, struct pw_resource *resource,
struct pw_properties *properties) struct pw_properties *properties)
@ -173,7 +205,15 @@ pw_metadata_new(struct pw_context *context, struct pw_resource *resource,
impl->resource = resource; impl->resource = resource;
impl->metadata = (struct pw_metadata*)resource; impl->metadata = (struct pw_metadata*)resource;
pw_global_add_listener(impl->global,
&impl->global_listener,
&global_events, impl);
pw_global_register(impl->global); pw_global_register(impl->global);
pw_resource_add_listener(resource,
&impl->resource_listener,
&global_resource_events, impl);
return impl; return impl;
} }