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

pulse-server: collect updates and apply after sync

Browse source 
Collect all object updates in a separate list. When we collected
all updates in sync, apply them and then signal notifications.
This ensure we have a consistent object model.
This commit is contained in:
Wim Taymans 2020-11-24 15:31:20 +01:00
parent 6ab25c6904
commit a65d4d04c3
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/module-protocol-pulse/manager.c
View file

@ -61,6 +61,8 @@ struct object {
const struct object_info *info; const struct object_info *info;
struct spa_list pending_list;
struct spa_hook proxy_listener; struct spa_hook proxy_listener;
struct spa_hook object_listener; struct spa_hook object_listener;
}; };
@ -122,6 +124,18 @@ static struct object *find_object(struct manager *m, uint32_t id)
return NULL; return NULL;
} }
static void object_update_params(struct object *o)
{
struct pw_manager_param *p;
spa_list_for_each(p, &o->pending_list, link)
clear_params(&o->this.param_list, p->id);
spa_list_consume(p, &o->pending_list, link) {
spa_list_remove(&p->link);
spa_list_append(&o->this.param_list, &p->link);
}
}
static void object_destroy(struct object *o) static void object_destroy(struct object *o)
{ {
struct manager *m = o->manager; struct manager *m = o->manager;
@ -132,6 +146,7 @@ static void object_destroy(struct object *o)
if (o->this.props) if (o->this.props)
pw_properties_free(o->this.props); pw_properties_free(o->this.props);
clear_params(&o->this.param_list, SPA_ID_INVALID); clear_params(&o->this.param_list, SPA_ID_INVALID);
clear_params(&o->pending_list, SPA_ID_INVALID);
free(o); free(o);
} }
@ -249,7 +264,7 @@ static void device_event_info(void *object, const struct pw_device_info *info)
case SPA_PARAM_Route: case SPA_PARAM_Route:
break; break;
} }
clear_params(&o->this.param_list, id); clear_params(&o->pending_list, id);
if (!(info->params[i].flags & SPA_PARAM_INFO_READ)) if (!(info->params[i].flags & SPA_PARAM_INFO_READ))
continue; continue;
@ -290,7 +305,7 @@ static void device_event_param(void *object, int seq,
struct object *o = object, *dev; struct object *o = object, *dev;
struct manager *m = o->manager; struct manager *m = o->manager;
add_param(&o->this.param_list, id, param); add_param(&o->pending_list, id, param);
if (id == SPA_PARAM_Route) { if (id == SPA_PARAM_Route) {
uint32_t id, device; uint32_t id, device;
@ -353,7 +368,7 @@ static void node_event_info(void *object, const struct pw_node_info *info)
info->params[i].user = 0; info->params[i].user = 0;
changed++; changed++;
clear_params(&o->this.param_list, id); clear_params(&o->pending_list, id);
if (!(info->params[i].flags & SPA_PARAM_INFO_READ)) if (!(info->params[i].flags & SPA_PARAM_INFO_READ))
continue; continue;
@ -372,7 +387,7 @@ static void node_event_param(void *object, int seq,
const struct spa_pod *param) const struct spa_pod *param)
{ {
struct object *o = object; struct object *o = object;
add_param(&o->this.param_list, id, param); add_param(&o->pending_list, id, param);
} }
static const struct pw_node_events node_events = { static const struct pw_node_events node_events = {
@ -517,6 +532,7 @@ static void registry_event_global(void *data, uint32_t id,
o->this.proxy = proxy; o->this.proxy = proxy;
o->this.creating = true; o->this.creating = true;
spa_list_init(&o->this.param_list); spa_list_init(&o->this.param_list);
spa_list_init(&o->pending_list);
o->manager = m; o->manager = m;
o->info = info; o->info = info;
@ -575,6 +591,9 @@ static void on_core_done(void *data, uint32_t id, int seq)
manager_emit_sync(m); manager_emit_sync(m);
spa_list_for_each(o, &m->this.object_list, this.link)
object_update_params(o);
spa_list_for_each(o, &m->this.object_list, this.link) { spa_list_for_each(o, &m->this.object_list, this.link) {
if (o->this.creating) { if (o->this.creating) {
o->this.creating = false; o->this.creating = false;