From 2f6c85cda14b140de8a3d98a6f3fa3f875c701ce Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 10 Jan 2019 10:20:26 +0100 Subject: [PATCH] remote: buffer id is now just the index of the buffer Buffer id is only used internally as the index of the buffer that was given to us by use_buffer or alloc_buffer --- src/pipewire/remote.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pipewire/remote.c b/src/pipewire/remote.c index af49c8595..32ef84389 100644 --- a/src/pipewire/remote.c +++ b/src/pipewire/remote.c @@ -988,7 +988,7 @@ client_node_port_use_buffers(void *object, struct pw_proxy *proxy = object; struct node_data *data = proxy->user_data; struct buffer *bid; - uint32_t i, j, len; + uint32_t i, j; struct spa_buffer *b, **bufs; struct mix *mix; int res, prot; @@ -1019,8 +1019,8 @@ client_node_port_use_buffers(void *object, goto cleanup; } - len = pw_array_get_len(&mix->buffers, struct buffer); bid = pw_array_add(&mix->buffers, sizeof(struct buffer)); + bid->id = i; bmem.mem_id = m->id; bmem.map.ptr = mem_map(data, &bmem.map, m->fd, prot, @@ -1059,9 +1059,6 @@ client_node_port_use_buffers(void *object, bid->mem[bid->n_mem++] = bmem; m->ref++; - if (bid->id != len) { - pw_log_warn("unexpected id %u found, expected %u", bid->id, len); - } pw_log_debug("add buffer %d %d %u %u", m->id, bid->id, bmem.map.map.offset, bmem.map.map.size);