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

context: move linked nodes when assigning a driver

Browse source 
When a node that requires a driver is moved to a driver, collect all
linked nodes and move them to the driver as well.

This fixes the case where a single jack node (zita-n2j) is linked to
paplay. The zita-n2j node is moved to the dummy driver but paplay is not
and so nothing happens before this patch.
This commit is contained in:
Wim Taymans 2022-01-26 12:25:35 +01:00
parent 910ba5856c
commit 0538034ed3
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/pipewire/context.c
View file

@ -894,24 +894,31 @@ static int ensure_state(struct pw_impl_node *node, bool running)
return pw_impl_node_set_state(node, state); return pw_impl_node_set_state(node, state);
} }
static int collect_nodes(struct pw_context *context, struct pw_impl_node *driver) static int collect_nodes(struct pw_context *context, struct pw_impl_node *node)
{ {
struct spa_list queue; struct spa_list queue;
struct pw_impl_node *n, *t; struct pw_impl_node *n, *t, *driver;
struct pw_impl_port *p; struct pw_impl_port *p;
struct pw_impl_link *l; struct pw_impl_link *l;
pw_log_debug("node %p: '%s'", node, node->name);
if (node->driver) {
driver = node;
spa_list_consume(t, &driver->follower_list, follower_link) { spa_list_consume(t, &driver->follower_list, follower_link) {
spa_list_remove(&t->follower_link); spa_list_remove(&t->follower_link);
spa_list_init(&t->follower_link); spa_list_init(&t->follower_link);
} }
} else {
driver = node->driver_node;
if (driver == NULL)
return -EINVAL;
}
pw_log_debug("driver %p: '%s'", driver, driver->name); /* start with node in the queue */
/* start with driver in the queue */
spa_list_init(&queue); spa_list_init(&queue);
spa_list_append(&queue, &driver->sort_link); spa_list_append(&queue, &node->sort_link);
driver->visited = true; node->visited = true;
/* now follow all the links from the nodes in the queue /* now follow all the links from the nodes in the queue
* and add the peers to the queue. */ * and add the peers to the queue. */
@ -1142,8 +1149,10 @@ again:
pw_impl_node_set_driver(n, t); pw_impl_node_set_driver(n, t);
if (t == NULL) if (t == NULL)
ensure_state(n, false); ensure_state(n, false);
else else {
t->passive = false; t->passive = false;
collect_nodes(context, n);
}
} }
n->visited = false; n->visited = false;
} }