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

link: only assume ports registered when registering the link

Browse source
This commit is contained in:
Wim Taymans 2018-04-24 17:09:34 +02:00
parent c24044108a
commit 5e89e9421c
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pipewire/link.c
View file

@ -1255,10 +1255,6 @@ struct pw_link *pw_link_new(struct pw_core *core,
spa_list_append(&output->links, &this->output_link); spa_list_append(&output->links, &this->output_link);
spa_list_append(&input->links, &this->input_link); spa_list_append(&input->links, &this->input_link);
this->info.output_node_id = output_node->global->id;
this->info.output_port_id = output->global->id;
this->info.input_node_id = input_node->global->id;
this->info.input_port_id = input->global->id;
this->info.format = NULL; this->info.format = NULL;
this->info.props = this->properties ? &this->properties->dict : NULL; this->info.props = this->properties ? &this->properties->dict : NULL;
@ -1322,6 +1318,14 @@ int pw_link_register(struct pw_link *link,
if (properties == NULL) if (properties == NULL)
return -ENOMEM; return -ENOMEM;
input_node = link->input->node;
output_node = link->output->node;
link->info.output_node_id = output_node->global->id;
link->info.output_port_id = link->output->global->id;
link->info.input_node_id = input_node->global->id;
link->info.input_port_id = link->input->global->id;
pw_properties_setf(properties, "link.output", "%d", link->info.output_port_id); pw_properties_setf(properties, "link.output", "%d", link->info.output_port_id);
pw_properties_setf(properties, "link.input", "%d", link->info.input_port_id); pw_properties_setf(properties, "link.input", "%d", link->info.input_port_id);
@ -1337,11 +1341,8 @@ int pw_link_register(struct pw_link *link,
pw_global_add_listener(link->global, &link->global_listener, &global_events, link); pw_global_add_listener(link->global, &link->global_listener, &global_events, link);
pw_global_register(link->global, owner, parent);
link->info.id = link->global->id; link->info.id = link->global->id;
pw_global_register(link->global, owner, parent);
input_node = link->input->node;
output_node = link->output->node;
pw_log_debug("link %p: in %d %d, out %d %d, %d %d %d %d", link, pw_log_debug("link %p: in %d %d, out %d %d, %d %d %d %d", link,
input_node->n_used_input_links, input_node->n_used_input_links,