mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipewire-jack: fix loop index

Browse source
This commit is contained in:
Wim Taymans 2018-02-16 16:53:18 +01:00
parent d73e77cd51
commit 570d32de2b
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pipewire-jack.c
View file

@ -600,7 +600,6 @@ static void handle_rtnode_message(struct client *c, struct pw_client_node_messag
if (!p->valid) if (!p->valid)
continue; continue;
pw_log_trace("%d %d", i, p->id);
output = &c->trans->outputs[p->id]; output = &c->trans->outputs[p->id];
if (output->buffer_id == SPA_ID_INVALID) if (output->buffer_id == SPA_ID_INVALID)
continue; continue;
@ -809,7 +808,7 @@ static void client_node_port_set_param(void *object,
static void clear_buffers(struct client *c, struct port *p) static void clear_buffers(struct client *c, struct port *p)
{ {
struct buffer *b; struct buffer *b;
int i; int i, j;
pw_log_debug(NAME" %p: port %p clear buffers", c, p); pw_log_debug(NAME" %p: port %p clear buffers", c, p);
@ -820,17 +819,18 @@ static void clear_buffers(struct client *c, struct port *p)
if (munmap(b->ptr, b->map.size) < 0) if (munmap(b->ptr, b->map.size) < 0)
pw_log_warn("failed to unmap: %m"); pw_log_warn("failed to unmap: %m");
} }
for (i = 0; i < b->n_datas; i++) { for (j = 0; j < b->n_datas; j++) {
struct spa_data *d = &b->datas[i]; struct spa_data *d = &b->datas[j];
if (d->fd != -1 && d->data) { if (d->fd != -1 && d->data) {
if (munmap(SPA_MEMBER(d->data, -d->mapoffset, void), if (munmap(SPA_MEMBER(d->data, -d->mapoffset, void),
d->maxsize + d->mapoffset) < 0) d->maxsize + d->mapoffset) < 0)
pw_log_warn("failed to unmap: %m"); pw_log_warn("failed to unmap: %m");
} }
d->fd = -1;
} }
for (i = 0; i < b->n_mem; i++) { for (j = 0; j < b->n_mem; j++) {
if (--b->mem[i]->ref == 0) if (--b->mem[j]->ref == 0)
clear_mem(c, b->mem[i]); clear_mem(c, b->mem[j]);
} }
b->n_mem = 0; b->n_mem = 0;
b->ptr = NULL; b->ptr = NULL;