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

impl-node: use the added boolean to add/remove source

Browse source 
There is no reason to use the loop of the source.
This commit is contained in:
Wim Taymans 2023-05-02 16:30:11 +02:00
parent 7d4491ce6b
commit 8f799af6df
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pipewire/impl-node.c
View file

@ -144,8 +144,7 @@ do_node_add(struct spa_loop *loop, bool async, uint32_t seq, const void *data, s
struct pw_impl_node *this = user_data; struct pw_impl_node *this = user_data;
struct pw_impl_node *driver = this->driver_node; struct pw_impl_node *driver = this->driver_node;
this->added = true; if (!this->added) {
if (this->source.loop == NULL) {
struct spa_system *data_system = this->data_system; struct spa_system *data_system = this->data_system;
uint64_t dummy; uint64_t dummy;
int res; int res;
@ -155,6 +154,7 @@ do_node_add(struct spa_loop *loop, bool async, uint32_t seq, const void *data, s
if (SPA_UNLIKELY(res != -EAGAIN && res != 0)) if (SPA_UNLIKELY(res != -EAGAIN && res != 0))
pw_log_warn("%p: read failed %m", this); pw_log_warn("%p: read failed %m", this);
this->added = true;
spa_loop_add_source(loop, &this->source); spa_loop_add_source(loop, &this->source);
add_node(this, driver); add_node(this, driver);
} }
@ -165,11 +165,11 @@ static int
do_node_remove(struct spa_loop *loop, bool async, uint32_t seq, const void *data, size_t size, void *user_data) do_node_remove(struct spa_loop *loop, bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{ {
struct pw_impl_node *this = user_data; struct pw_impl_node *this = user_data;
if (this->source.loop != NULL) { if (this->added) {
spa_loop_remove_source(loop, &this->source); spa_loop_remove_source(loop, &this->source);
remove_node(this); remove_node(this);
this->added = false;
} }
this->added = false;
return 0; return 0;
} }
@ -810,7 +810,7 @@ do_move_nodes(struct spa_loop *loop,
node->target_rate = node->rt.position->clock.target_rate; node->target_rate = node->rt.position->clock.target_rate;
node->target_quantum = node->rt.position->clock.target_duration; node->target_quantum = node->rt.position->clock.target_duration;
if (node->source.loop != NULL) { if (node->added) {
remove_node(node); remove_node(node);
add_node(node, driver); add_node(node, driver);
} }