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

Revert "rework param updates"

Browse source 
This reverts commit 5aa7746c95.

Routes are duplicated for some reason, needs more debugging.
This commit is contained in:
Wim Taymans 2021-02-04 20:55:48 +01:00
parent be25a00ddb
commit 994fc1169e
6 changed files with 88 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,45 +73,24 @@ static void core_sync(struct manager *m)
pw_log_debug("sync start %u", m->sync_seq);
}
static uint32_t clear_params(struct spa_list *param_list, uint32_t id)
{
struct pw_manager_param *p, *t;
uint32_t count = 0;
spa_list_for_each_safe(p, t, param_list, link) {
if (id == SPA_ID_INVALID || p->id == id) {
spa_list_remove(&p->link);
free(p);
count++;
}
}
return count;
}
static struct pw_manager_param *add_param(struct spa_list *params, uint32_t id, const struct spa_pod *param)
{
struct pw_manager_param *p;
if (id == SPA_ID_INVALID) {
if (param == NULL || !spa_pod_is_object(param)) {
errno = EINVAL;
return NULL;
}
id = SPA_POD_OBJECT_ID(param);
if (param == NULL || !spa_pod_is_object(param)) {
errno = EINVAL;
return NULL;
}
if (id == SPA_ID_INVALID)
id = SPA_POD_OBJECT_ID(param);
p = malloc(sizeof(*p) + (param != NULL ? SPA_POD_SIZE(param) : 0));
p = malloc(sizeof(*p) + SPA_POD_SIZE(param));
if (p == NULL)
return NULL;
p->id = id;
if (param != NULL) {
p->param = SPA_MEMBER(p, sizeof(*p), struct spa_pod);
memcpy(p->param, param, SPA_POD_SIZE(param));
} else {
clear_params(params, id);
p->param = NULL;
}
p->param = SPA_MEMBER(p, sizeof(*p), struct spa_pod);
memcpy(p->param, param, SPA_POD_SIZE(param));
spa_list_append(params, &p->link);
return p;
@ -129,6 +108,21 @@ static bool has_param(struct spa_list *param_list, struct pw_manager_param *p)
return false;
}
static uint32_t clear_params(struct spa_list *param_list, uint32_t id)
{
struct pw_manager_param *p, *t;
uint32_t count = 0;
spa_list_for_each_safe(p, t, param_list, link) {
if (id == SPA_ID_INVALID || p->id == id) {
spa_list_remove(&p->link);
free(p);
count++;
}
}
return count;
}
static struct object *find_object(struct manager *m, uint32_t id)
{
@ -146,14 +140,12 @@ 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);
if (p->param == NULL) {
clear_params(&o->this.param_list, p->id);
free(p);
} else {
spa_list_append(&o->this.param_list, &p->link);
}
spa_list_append(&o->this.param_list, &p->link);
}
}
@ -285,7 +277,7 @@ static void device_event_info(void *object, const struct pw_device_info *info)
case SPA_PARAM_Route:
break;
}
add_param(&o->pending_list, id, NULL);
clear_params(&o->pending_list, id);
if (!(info->params[i].flags & SPA_PARAM_INFO_READ))
continue;
@ -390,7 +382,7 @@ static void node_event_info(void *object, const struct pw_node_info *info)
info->params[i].user = 0;
changed++;
add_param(&o->pending_list, id, NULL);
clear_params(&o->pending_list, id);
if (!(info->params[i].flags & SPA_PARAM_INFO_READ))
continue;