mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05: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

68
src/tools/pw-dump.c
View file

@ -122,6 +122,29 @@ static void core_sync(struct data *d)
pw_log_debug("sync start %u", d->sync_seq);
}
static struct param *add_param(struct spa_list *params, uint32_t id, const struct spa_pod *param)
{
struct param *p;
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) + SPA_POD_SIZE(param));
if (p == NULL)
return NULL;
p->id = id;
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;
}
static uint32_t clear_params(struct spa_list *param_list, uint32_t id)
{
struct param *p, *t;
@ -137,35 +160,6 @@ static uint32_t clear_params(struct spa_list *param_list, uint32_t id)
return count;
}
static struct param *add_param(struct spa_list *params, uint32_t id, const struct spa_pod *param)
{
struct 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);
}
p = malloc(sizeof(*p) + (param != NULL ? SPA_POD_SIZE(param) : 0));
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;
}
spa_list_append(params, &p->link);
return p;
}
static struct object *find_object(struct data *d, uint32_t id)
{
struct object *o;
@ -180,14 +174,12 @@ static void object_update_params(struct object *o)
{
struct param *p;
spa_list_for_each(p, &o->pending_list, link)
clear_params(&o->param_list, p->id);
spa_list_consume(p, &o->pending_list, link) {
spa_list_remove(&p->link);
if (p->param == NULL) {
clear_params(&o->param_list, p->id);
free(p);
} else {
spa_list_append(&o->param_list, &p->link);
}
spa_list_append(&o->param_list, &p->link);
}
}
@ -490,7 +482,7 @@ static void put_params(struct data *d, const char *key,
put_begin(d, spa_debug_type_find_short_name(spa_type_param, pi->id),
"[", flags);
spa_list_for_each(p, list, link) {
if (p->id == pi->id)
if (p->id == pi->id && flags == 0)
put_pod(d, NULL, p->param);
}
put_end(d, "]", flags);
@ -842,7 +834,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;
@ -925,7 +917,7 @@ static void port_event_info(void *object, const struct pw_port_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;