From 265e6ca352b13ffa991c0cce310f1594087e6d12 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 21 Jun 2023 10:23:07 +0200 Subject: [PATCH] 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. --- src/modules/module-client-node/client-node.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c index 3012c08bb..cb6a993ea 100644 --- a/src/modules/module-client-node/client-node.c +++ b/src/modules/module-client-node/client-node.c @@ -50,7 +50,7 @@ struct buffer { struct mix { unsigned int valid:1; - uint32_t id; + uint32_t mix_id; struct port *port; uint32_t peer_id; uint32_t n_buffers; @@ -209,10 +209,10 @@ static struct mix *find_mix(struct port *p, uint32_t mix_id) 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->id = id; + mix->mix_id = mix_id; mix->port = p; mix->n_buffers = 0; } @@ -281,7 +281,7 @@ static void mix_clear(struct impl *impl, struct mix *mix) if (!mix->valid) return; do_port_use_buffers(impl, port->direction, port->id, - mix->id, 0, NULL, 0); + mix->mix_id, 0, NULL, 0); mix->valid = false; }