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

modules: handle factory destroy

Browse source 
Listen for factory destroy and clean up the module.

See #565
This commit is contained in:
Wim Taymans 2022-05-06 12:11:20 +02:00
parent 95f8c569a0
commit 383df85466
12 changed files with 264 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/modules/spa/module-device-factory.c
View file

@ -51,12 +51,13 @@ static const struct spa_dict_item module_props[] = {
struct factory_data {
struct pw_context *context;
struct pw_impl_module *module;
struct pw_impl_factory *this;
struct spa_hook factory_listener;
struct pw_impl_module *module;
struct spa_hook module_listener;
struct pw_impl_factory *factory;
struct spa_hook factory_listener;
struct spa_list device_list;
};
@ -120,7 +121,7 @@ static void *create_object(void *_data,
goto error_properties;
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_global_get_id(pw_impl_factory_get_global(data->this)));
pw_global_get_id(pw_impl_factory_get_global(data->factory)));
client = resource ? pw_resource_get_client(resource) : NULL;
@ -190,16 +191,19 @@ static const struct pw_impl_factory_implementation factory_impl = {
.create_object = create_object,
};
static void factory_destroy(void *_data)
static void factory_destroy(void *data)
{
struct factory_data *data = _data;
struct factory_data *d = data;
struct device_data *nd;
spa_hook_remove(&data->factory_listener);
spa_hook_remove(&data->module_listener);
spa_hook_remove(&d->factory_listener);
spa_list_consume(nd, &data->device_list, link)
spa_list_consume(nd, &d->device_list, link)
pw_impl_device_destroy(nd->device);
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
}
static const struct pw_impl_factory_events factory_events = {
@ -207,17 +211,21 @@ static const struct pw_impl_factory_events factory_events = {
.destroy = factory_destroy,
};
static void module_destroy(void *_data)
static void module_destroy(void *data)
{
struct factory_data *data = _data;
pw_impl_factory_destroy(data->this);
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
d->module = NULL;
if (d->factory)
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_impl_module *module = d->module;
struct pw_impl_factory *factory = d->this;
struct pw_impl_factory *factory = d->factory;
struct spa_dict_item items[1];
char id[16];
int res;
@ -256,7 +264,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
return -errno;
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->factory = factory;
data->module = module;
data->context = context;
spa_list_init(&data->device_list);