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

Revert "link: only set port io once"

Browse source 
This reverts commit 024429ea7b.
This commit is contained in:
Wim Taymans 2019-09-30 09:27:00 +02:00
parent 990ecd20c5
commit 4421cc473b
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pipewire/link.c
View file

@ -55,10 +55,9 @@
struct impl { struct impl {
struct pw_link this; struct pw_link this;
unsigned int prepare:1; bool prepare;
unsigned int ioset:1; bool activated;
unsigned int activated:1; bool passive;
unsigned int passive:1;
struct pw_work_queue *work; struct pw_work_queue *work;
@ -757,16 +756,13 @@ int pw_link_activate(struct pw_link *this)
pw_link_prepare(this); pw_link_prepare(this);
if (!impl->ioset) { if ((res = port_set_io(this, this->output, SPA_IO_Buffers, this->io,
if ((res = port_set_io(this, this->output, SPA_IO_Buffers, this->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;
if ((res = port_set_io(this, this->input, SPA_IO_Buffers, this->io, if ((res = port_set_io(this, this->input, SPA_IO_Buffers, this->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;
impl->ioset = true;
}
if (this->info.state == PW_LINK_STATE_PAUSED) { if (this->info.state == PW_LINK_STATE_PAUSED) {
pw_loop_invoke(this->output->node->data_loop, pw_loop_invoke(this->output->node->data_loop,
@ -969,7 +965,6 @@ int pw_link_deactivate(struct pw_link *this)
port_set_io(this, this->output, SPA_IO_Buffers, NULL, 0, &this->rt.out_mix); port_set_io(this, this->output, SPA_IO_Buffers, NULL, 0, &this->rt.out_mix);
port_set_io(this, this->input, SPA_IO_Buffers, NULL, 0, &this->rt.in_mix); port_set_io(this, this->input, SPA_IO_Buffers, NULL, 0, &this->rt.in_mix);
impl->ioset = false;
impl->activated = false; impl->activated = false;
} }