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

factory: improve registration

Browse source
This commit is contained in:
Wim Taymans 2018-02-16 12:01:18 +01:00
parent 0173180e78
commit 8c4bb3a104
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pipewire/factory.c
View file

@ -60,8 +60,11 @@ void pw_factory_destroy(struct pw_factory *factory)
pw_log_debug("factory %p: destroy", factory); pw_log_debug("factory %p: destroy", factory);
spa_hook_list_call(&factory->listener_list, struct pw_factory_events, destroy); spa_hook_list_call(&factory->listener_list, struct pw_factory_events, destroy);
if (factory->global) { if (factory->registered)
spa_list_remove(&factory->link); spa_list_remove(&factory->link);
if (factory->global) {
spa_hook_remove(&factory->global_listener);
pw_global_destroy(factory->global); pw_global_destroy(factory->global);
} }
if (factory->info.name) if (factory->info.name)
@ -137,8 +140,6 @@ int pw_factory_register(struct pw_factory *factory,
{ {
struct pw_core *core = factory->core; struct pw_core *core = factory->core;
spa_list_append(&core->factory_list, &factory->link);
if (properties == NULL) if (properties == NULL)
properties = pw_properties_new(NULL, NULL); properties = pw_properties_new(NULL, NULL);
if (properties == NULL) if (properties == NULL)
@ -149,6 +150,9 @@ int pw_factory_register(struct pw_factory *factory,
spa_type_map_get_type(core->type.map, factory->info.type)); spa_type_map_get_type(core->type.map, factory->info.type));
pw_properties_setf(properties, "factory.type.version", "%d", factory->info.version); pw_properties_setf(properties, "factory.type.version", "%d", factory->info.version);
spa_list_append(&core->factory_list, &factory->link);
factory->registered = true;
factory->global = pw_global_new(core, factory->global = pw_global_new(core,
core->type.factory, PW_VERSION_FACTORY, core->type.factory, PW_VERSION_FACTORY,
properties, properties,
@ -156,6 +160,7 @@ int pw_factory_register(struct pw_factory *factory,
if (factory->global == NULL) if (factory->global == NULL)
return -ENOMEM; return -ENOMEM;
pw_global_add_listener(factory->global, &factory->global_listener, &global_events, factory); pw_global_add_listener(factory->global, &factory->global_listener, &global_events, factory);
pw_global_register(factory->global, owner, parent); pw_global_register(factory->global, owner, parent);
factory->info.id = factory->global->id; factory->info.id = factory->global->id;

1
src/pipewire/private.h
View file

@ -407,6 +407,7 @@ struct pw_factory {
struct spa_list link; /**< link in core node_factory_list */ struct spa_list link; /**< link in core node_factory_list */
struct pw_global *global; /**< global for this factory */ struct pw_global *global; /**< global for this factory */
struct spa_hook global_listener; struct spa_hook global_listener;
bool registered;
struct pw_factory_info info; /**< introspectable factory info */ struct pw_factory_info info; /**< introspectable factory info */
struct pw_properties *properties; /**< properties of the factory */ struct pw_properties *properties; /**< properties of the factory */