From 4421cc473b04d163b7468d2f8045ce7940a9a68e Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 30 Sep 2019 09:27:00 +0200 Subject: [PATCH] Revert "link: only set port io once" This reverts commit 024429ea7b9c1326579f88eef815612db40589d2. --- src/pipewire/link.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/pipewire/link.c b/src/pipewire/link.c index 71c620ecc..99f250c30 100644 --- a/src/pipewire/link.c +++ b/src/pipewire/link.c @@ -55,10 +55,9 @@ struct impl { struct pw_link this; - unsigned int prepare:1; - unsigned int ioset:1; - unsigned int activated:1; - unsigned int passive:1; + bool prepare; + bool activated; + bool passive; struct pw_work_queue *work; @@ -757,16 +756,13 @@ int pw_link_activate(struct pw_link *this) pw_link_prepare(this); - if (!impl->ioset) { - if ((res = port_set_io(this, this->output, SPA_IO_Buffers, this->io, - sizeof(struct spa_io_buffers), &this->rt.out_mix)) < 0) - return res; + if ((res = port_set_io(this, this->output, SPA_IO_Buffers, this->io, + sizeof(struct spa_io_buffers), &this->rt.out_mix)) < 0) + return res; - if ((res = port_set_io(this, this->input, SPA_IO_Buffers, this->io, - sizeof(struct spa_io_buffers), &this->rt.in_mix)) < 0) - return res; - impl->ioset = true; - } + if ((res = port_set_io(this, this->input, SPA_IO_Buffers, this->io, + sizeof(struct spa_io_buffers), &this->rt.in_mix)) < 0) + return res; if (this->info.state == PW_LINK_STATE_PAUSED) { 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->input, SPA_IO_Buffers, NULL, 0, &this->rt.in_mix); - impl->ioset = false; impl->activated = false; }