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

link: improve state management

Browse source 
Only activate a link when both nodes are active
Don't try to prepare the link when already prepared.
Only unprepare the link when it was prepared
This commit is contained in:
Wim Taymans 2020-04-28 12:17:33 +02:00
parent f5e4a6b225
commit 69bc57864a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pipewire/impl-link.c
View file

@ -517,7 +517,7 @@ int pw_impl_link_activate(struct pw_impl_link *this)
pw_log_debug(NAME" %p: activate activated:%d state:%s", this, impl->activated, pw_log_debug(NAME" %p: activate activated:%d state:%s", this, impl->activated,
pw_link_state_as_string(this->info.state)); pw_link_state_as_string(this->info.state));
if (impl->activated || !this->prepared) if (impl->activated || !this->prepared || !impl->inode->active || !impl->onode->active)
return 0; return 0;
if (!impl->io_set) { if (!impl->io_set) {
@ -673,9 +673,9 @@ int pw_impl_link_prepare(struct pw_impl_link *this)
{ {
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this); struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
pw_log_debug(NAME" %p: prepare busy:%d", this, this->preparing); pw_log_debug(NAME" %p: prepare prepared:%d busy:%d", this, this->prepared, this->preparing);
if (this->preparing) if (this->preparing || this->prepared)
return 0; return 0;
this->preparing = true; this->preparing = true;
@ -771,7 +771,7 @@ static void port_state_changed(struct pw_impl_link *this, struct pw_impl_port *p
pw_impl_link_update_state(this, PW_LINK_STATE_ERROR, error ? strdup(error) : NULL); pw_impl_link_update_state(this, PW_LINK_STATE_ERROR, error ? strdup(error) : NULL);
break; break;
default: default:
if (state < PW_IMPL_PORT_STATE_PAUSED) { if (state < PW_IMPL_PORT_STATE_PAUSED && this->prepared) {
this->preparing = false; this->preparing = false;
this->prepared = false; this->prepared = false;
pw_impl_link_update_state(this, PW_LINK_STATE_INIT, NULL); pw_impl_link_update_state(this, PW_LINK_STATE_INIT, NULL);