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

policy-node: keep track how many times we link a node

Browse source 
Nodes that are marked as DONT_RECONNECT are only linked once.
Fixes a problem where a clients makes a DONT_RECONNECT stream but
without a specific sink.

See #395
This commit is contained in:
Wim Taymans 2020-11-20 14:54:37 +01:00
parent 00ac94ab9b
commit dae64bd2b5
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/examples/media-session/policy-node.c
View file

@ -90,6 +90,7 @@ struct node {
struct spa_audio_info format; struct spa_audio_info format;
int connect_count;
uint64_t plugged; uint64_t plugged;
unsigned int active:1; unsigned int active:1;
unsigned int exclusive:1; unsigned int exclusive:1;
@ -510,9 +511,10 @@ static int link_nodes(struct node *node, struct node *peer)
pw_properties_setf(props, PW_KEY_LINK_INPUT_NODE, "%d", input->id); pw_properties_setf(props, PW_KEY_LINK_INPUT_NODE, "%d", input->id);
pw_log_info("linking node %d to node %d", output->id, input->id); pw_log_info("linking node %d to node %d", output->id, input->id);
if (sm_media_session_create_links(impl->session, &props->dict) > 0) if (sm_media_session_create_links(impl->session, &props->dict) > 0) {
node->peer = peer; node->peer = peer;
node->connect_count++;
}
pw_properties_free(props); pw_properties_free(props);
return 0; return 0;
@ -652,7 +654,7 @@ static int rescan_node(struct impl *impl, struct node *n)
pw_log_warn("node %d target:%d not found, find fallback:%d", n->id, pw_log_warn("node %d target:%d not found, find fallback:%d", n->id,
path_id, reconnect); path_id, reconnect);
} }
if (path_id == SPA_ID_INVALID && reconnect) { if (path_id == SPA_ID_INVALID && (reconnect || n->connect_count == 0)) {
spa_list_for_each(peer, &impl->node_list, link) spa_list_for_each(peer, &impl->node_list, link)
find_node(&find, peer); find_node(&find, peer);
} }