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

link: pass id to _set_io

Browse source
This commit is contained in:
Wim Taymans 2018-09-28 17:50:22 +02:00
parent 089fc2e8c1
commit 1ca399d4a6
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/pipewire/link.c
View file

@ -545,23 +545,22 @@ param_filter(struct pw_link *this,
return num; return num;
} }
static int port_set_io(struct pw_link *this, struct pw_port *port, void *data, size_t size, static int port_set_io(struct pw_link *this, struct pw_port *port, uint32_t id,
struct pw_port_mix *mix) void *data, size_t size, struct pw_port_mix *mix)
{ {
struct spa_graph_port *p = &mix->port; struct spa_graph_port *p = &mix->port;
int res = 0; int res = 0;
mix->io = data; mix->io = data;
pw_log_debug("link %p: %s port %p %d.%d set io: %p", this, pw_log_debug("link %p: %s port %p %d.%d set io: %d %p %zd", this,
pw_direction_as_string(port->direction), pw_direction_as_string(port->direction),
port, port->port_id, p->port_id, data); port, port->port_id, p->port_id, id, data, size);
if (port->mix && port->mix->port_set_io) { if (port->mix->port_set_io) {
if ((res = spa_node_port_set_io(port->mix, if ((res = spa_node_port_set_io(port->mix,
p->direction, p->direction,
p->port_id, p->port_id,
SPA_IO_Buffers, id, data, size)) < 0)
data, size)) < 0)
pw_log_warn("port %p: can't set io: %s", port, spa_strerror(res)); pw_log_warn("port %p: can't set io: %s", port, spa_strerror(res));
} }
return res; return res;
@ -584,11 +583,11 @@ static int select_io(struct pw_link *this)
if (io == NULL) if (io == NULL)
return -EIO; return -EIO;
if ((res = port_set_io(this, this->input, io, if ((res = port_set_io(this, this->input, SPA_IO_Buffers, io,
sizeof(struct spa_io_buffers), &this->rt.in_mix)) < 0) sizeof(struct spa_io_buffers), &this->rt.in_mix)) < 0)
return res; return res;
if ((res = port_set_io(this, this->output, io, if ((res = port_set_io(this, this->output, SPA_IO_Buffers, io,
sizeof(struct spa_io_buffers), &this->rt.out_mix)) < 0) sizeof(struct spa_io_buffers), &this->rt.out_mix)) < 0)
return res; return res;
@ -978,7 +977,7 @@ static void input_remove(struct pw_link *this, struct pw_port *port)
clear_port_buffers(this, port); clear_port_buffers(this, port);
port_set_io(this, this->input, NULL, 0, mix); port_set_io(this, this->input, SPA_IO_Buffers, NULL, 0, mix);
pw_port_release_mix(port, mix); pw_port_release_mix(port, mix);
this->input = NULL; this->input = NULL;
} }
@ -997,7 +996,7 @@ static void output_remove(struct pw_link *this, struct pw_port *port)
clear_port_buffers(this, port); clear_port_buffers(this, port);
port_set_io(this, this->output, NULL, 0, mix); port_set_io(this, this->output, SPA_IO_Buffers, NULL, 0, mix);
pw_port_release_mix(port, mix); pw_port_release_mix(port, mix);
this->output = NULL; this->output = NULL;
} }