client-node: rename confusing id to mix_id

There is already an id in the port_mix structure that can be used to
index the mix structures in map if needed, the mix_id is the port_id of
the mixer and should not be confused.
This commit is contained in:
Wim Taymans 2023-06-21 10:23:07 +02:00
parent 85af2bdef2
commit 265e6ca352

View file

@ -50,7 +50,7 @@ struct buffer {
struct mix { struct mix {
unsigned int valid:1; unsigned int valid:1;
uint32_t id; uint32_t mix_id;
struct port *port; struct port *port;
uint32_t peer_id; uint32_t peer_id;
uint32_t n_buffers; uint32_t n_buffers;
@ -209,10 +209,10 @@ static struct mix *find_mix(struct port *p, uint32_t mix_id)
return mix; return mix;
} }
static void mix_init(struct mix *mix, struct port *p, uint32_t id) static void mix_init(struct mix *mix, struct port *p, uint32_t mix_id)
{ {
mix->valid = true; mix->valid = true;
mix->id = id; mix->mix_id = mix_id;
mix->port = p; mix->port = p;
mix->n_buffers = 0; mix->n_buffers = 0;
} }
@ -281,7 +281,7 @@ static void mix_clear(struct impl *impl, struct mix *mix)
if (!mix->valid) if (!mix->valid)
return; return;
do_port_use_buffers(impl, port->direction, port->id, do_port_use_buffers(impl, port->direction, port->id,
mix->id, 0, NULL, 0); mix->mix_id, 0, NULL, 0);
mix->valid = false; mix->valid = false;
} }