port: simplify buffer allocation

Use just one function to do buffer allocation on a port.

Remove some unused variables.
This commit is contained in:
Wim Taymans 2019-08-07 12:56:57 +02:00
parent a319ec55ea
commit 06446e0d64
6 changed files with 91 additions and 185 deletions

View file

@ -334,7 +334,7 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
struct impl *impl = this->impl;
struct pw_memmap *mm;
uint32_t memid, mem_offset, mem_size;
uint32_t tag[5] = { impl->node_id, id };
uint32_t tag[5] = { impl->node_id, id, };
if (impl->this.flags & 1)
return 0;

View file

@ -498,7 +498,7 @@ static int clear_buffers(struct node_data *data, struct mix *mix)
pw_log_debug("port %p: clear buffers mix:%d %zd", port, mix->mix_id, mix->buffers.size);
if ((res = pw_port_use_buffers(port, mix->mix_id, 0, NULL, 0)) < 0) {
if ((res = pw_port_use_buffers(port, &mix->mix, 0, NULL, 0)) < 0) {
pw_log_error("port %p: error clear buffers %s", port, spa_strerror(res));
return res;
}
@ -672,7 +672,7 @@ client_node_port_use_buffers(void *object,
bufs[i] = b;
}
if ((res = pw_port_use_buffers(mix->port, mix_id, flags, bufs, n_buffers)) < 0)
if ((res = pw_port_use_buffers(mix->port, &mix->mix, flags, bufs, n_buffers)) < 0)
goto error_exit_cleanup;
if (flags & SPA_NODE_BUFFERS_FLAG_ALLOC) {