mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use mapper to make object id

Browse source 
Reuse object ids by using a mapper
Simpify the uri struct a little.
This commit is contained in:
Wim Taymans 2016-11-21 16:29:15 +01:00
parent f42268b9a5
commit e7cae649aa
14 changed files with 61 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pinos/server/core.c
View file

@ -24,8 +24,6 @@
typedef struct {
PinosCore this;
uint32_t counter;
SpaSupport support[4];
} PinosCoreImpl;
@ -38,13 +36,15 @@ pinos_core_new (PinosMainLoop *main_loop)
impl = calloc (1, sizeof (PinosCoreImpl));
this = &impl->this;
pinos_registry_init (&this->registry);
pinos_uri_init (&this->uri);
pinos_map_init (&this->objects, 512);
this->data_loop = pinos_data_loop_new ();
this->main_loop = main_loop;
impl->support[0].uri = SPA_ID_MAP_URI;
impl->support[0].data = this->registry.map;
impl->support[0].data = this->uri.map;
impl->support[1].uri = SPA_LOG_URI;
impl->support[1].data = pinos_log_get ();
impl->support[2].uri = SPA_LOOP__DataLoop;
@ -93,17 +93,17 @@ pinos_core_add_global (PinosCore *core,
uint32_t type,
void *object)
{
PinosCoreImpl *impl = SPA_CONTAINER_OF (core, PinosCoreImpl, this);
PinosGlobal *global;
global = calloc (1, sizeof (PinosGlobal));
global->core = core;
global->id = ++impl->counter;
global->type = type;
global->object = object;
pinos_signal_init (&global->destroy_signal);
global->id = pinos_map_insert_new (&core->objects, global);
spa_list_insert (core->global_list.prev, &global->link);
pinos_signal_emit (&core->global_added, core, global);
@ -117,6 +117,8 @@ pinos_global_destroy (PinosGlobal *global)
pinos_signal_emit (&global->destroy_signal, global);
pinos_map_remove (&core->objects, global->id);
spa_list_remove (&global->link);
pinos_signal_emit (&core->global_removed, core, global);