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

impl-link: block some actions when destroyed

Browse source 
When we destroy a port, make sure we don't start to reactivate it
again.
This commit is contained in:
Wim Taymans 2023-06-21 10:25:30 +02:00
parent 1e4adff3fa
commit 7a629fa378
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -655,7 +655,7 @@ int pw_impl_link_activate(struct pw_impl_link *this)
pw_log_debug("%p: activate activated:%d state:%s", this, impl->activated, pw_log_debug("%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 (this->destroyed || impl->activated || !this->prepared ||
!impl->inode->runnable || !impl->onode->runnable) !impl->inode->runnable || !impl->onode->runnable)
return 0; return 0;
@ -820,7 +820,7 @@ int pw_impl_link_prepare(struct pw_impl_link *this)
if (!impl->inode->active || !impl->onode->active) if (!impl->inode->active || !impl->onode->active)
return 0; return 0;
if (this->preparing || this->prepared) if (this->destroyed || this->preparing || this->prepared)
return 0; return 0;
this->preparing = true; this->preparing = true;
@ -861,8 +861,9 @@ int pw_impl_link_deactivate(struct pw_impl_link *this)
impl->activated = false; impl->activated = false;
pw_log_info("(%s) deactivated", this->name); pw_log_info("(%s) deactivated", this->name);
link_update_state(this, PW_LINK_STATE_PAUSED, 0, NULL); link_update_state(this, this->destroyed ?
PW_LINK_STATE_INIT : PW_LINK_STATE_PAUSED,
0, NULL);
return 0; return 0;
} }
@ -1433,6 +1434,8 @@ void pw_impl_link_destroy(struct pw_impl_link *link)
pw_log_debug("%p: destroy", impl); pw_log_debug("%p: destroy", impl);
pw_log_info("(%s) destroy", link->name); pw_log_info("(%s) destroy", link->name);
link->destroyed = true;
pw_impl_link_emit_destroy(link); pw_impl_link_emit_destroy(link);
pw_impl_link_deactivate(link); pw_impl_link_deactivate(link);

1
src/pipewire/private.h
View file

@ -990,6 +990,7 @@ struct pw_impl_link {
unsigned int preparing:1; unsigned int preparing:1;
unsigned int prepared:1; unsigned int prepared:1;
unsigned int passive:1; unsigned int passive:1;
unsigned int destroyed:1;
}; };
#define pw_resource_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_resource_events, m, v, ##__VA_ARGS__) #define pw_resource_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_resource_events, m, v, ##__VA_ARGS__)