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

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

35
src/modules/module-client-device.c
View file

@ -56,7 +56,8 @@ struct pw_proxy *pw_core_spa_device_export(struct pw_core *core,
struct pw_protocol *pw_protocol_native_ext_client_device_init(struct pw_context *context);
struct factory_data {
struct pw_impl_factory *this;
struct pw_impl_factory *factory;
struct spa_hook factory_listener;
struct pw_impl_module *module;
struct spa_hook module_listener;
@ -72,7 +73,7 @@ static void *create_object(void *_data,
uint32_t new_id)
{
struct factory_data *data = _data;
struct pw_impl_factory *this = data->this;
struct pw_impl_factory *factory = data->factory;
void *result;
struct pw_resource *device_resource;
struct pw_impl_client *client;
@ -98,7 +99,7 @@ static void *create_object(void *_data,
}
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_global_get_id(pw_impl_factory_get_global(this)));
pw_global_get_id(pw_impl_factory_get_global(factory)));
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_global_get_id(pw_impl_client_get_global(client)));
@ -134,22 +135,35 @@ static const struct pw_impl_factory_implementation impl_factory = {
.create_object = create_object,
};
static void factory_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->factory_listener);
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
}
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
spa_list_remove(&d->export_spadevice.link);
pw_impl_factory_destroy(d->this);
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;
@ -190,7 +204,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;
pw_log_debug("module %p: new", module);
@ -206,12 +220,13 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_protocol_native_ext_client_device_init(context);
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
return 0;
error:
pw_impl_factory_destroy(data->this);
pw_impl_factory_destroy(data->factory);
return res;
}