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

media-session: improve cleanup of objects

Browse source 
Don't try to use the proxy destroy event to destroy the objects.
It is not called automatically anymore, only when we call
pw_proxy_destroy() ourselves.

Destroy the proxy objects when we destroy the session managed
object instead, either when the global is removed or when we
explicitly call _destroy()

Add an object free signal to clean up final resources after the
proxies have been destroyed, like closing libraries.

Track and destroy our link proxies.
This commit is contained in:
Wim Taymans 2020-06-04 17:41:01 +02:00
parent 47ae56df7d
commit ed31ca30cd
4 changed files with 104 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/examples/media-session/alsa-monitor.c
View file

@ -604,9 +604,27 @@ static void device_destroy(void *data)
struct node *node;
pw_log_debug("device %p destroy", device);
spa_list_remove(&device->link);
spa_list_consume(node, &device->node_list, link)
alsa_remove_node(device, node);
if (device->appeared)
spa_hook_remove(&device->device_listener);
if (device->seq != 0)
spa_hook_remove(&device->sync_listener);
if (device->reserve)
rd_device_destroy(device->reserve);
}
static void device_free(void *data)
{
struct device *device = data;
pw_log_debug("device %p free", device);
spa_hook_remove(&device->listener);
pw_unload_spa_handle(device->handle);
pw_properties_free(device->props);
free(device);
}
static void device_update(void *data)
@ -630,8 +648,9 @@ static void device_update(void *data)
static const struct sm_object_events device_events = {
SM_VERSION_OBJECT_EVENTS,
.destroy = device_destroy,
.update = device_update,
.destroy = device_destroy,
.free = device_free,
.update = device_update,
};
static struct device *alsa_create_device(struct impl *impl, uint32_t id,
@ -729,21 +748,9 @@ exit:
static void alsa_remove_device(struct impl *impl, struct device *device)
{
pw_log_debug("remove device %u", device->id);
spa_list_remove(&device->link);
if (device->appeared)
spa_hook_remove(&device->device_listener);
if (device->seq != 0)
spa_hook_remove(&device->sync_listener);
if (device->reserve)
rd_device_destroy(device->reserve);
if (device->sdevice) {
pw_log_debug("%p: remove device %u", device, device->id);
if (device->sdevice)
sm_object_destroy(&device->sdevice->obj);
spa_hook_remove(&device->listener);
}
pw_unload_spa_handle(device->handle);
pw_properties_free(device->props);
free(device);
}
static void alsa_udev_object_info(void *data, uint32_t id,