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

control: make control links many to many

Browse source 
Output controls can be linked to many input controls and many input
controls can receive input from many output controls. Keep the control
link information inside the link.
This commit is contained in:
Wim Taymans 2019-03-14 12:04:20 +01:00
parent 7b3e7e2813
commit 24117b33c7
8 changed files with 131 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-client-node/client-node.c
View file

@ -792,10 +792,10 @@ impl_node_port_set_io(struct spa_node *node,
uint32_t id,
void *data, size_t size)
{
/* ignore io on the node itself, weonly care about the io on the
/* ignore io on the node itself, we only care about the io on the
* port mixers, the io on the node ports itself is handled on the
* client side */
return 0;
return -EINVAL;
}
static int

13
src/modules/module-client-node/client-stream.c
View file

@ -106,6 +106,9 @@ struct impl {
struct spa_buffer **buffers;
uint32_t n_buffers;
struct pw_memblock *mem;
struct pw_control_link control;
struct pw_control_link notify;
};
/** \endcond */
@ -187,18 +190,19 @@ static void try_link_controls(struct impl *impl)
port = impl->client_port;
pw_log_debug(NAME " %p: trying controls", impl);
spa_list_for_each(cout, &port->control_list[SPA_DIRECTION_OUTPUT], port_link) {
spa_list_for_each(cin, &target->control_list[SPA_DIRECTION_INPUT], port_link) {
if ((res = pw_control_link(cout, cin)) < 0)
if ((res = pw_control_add_link(cout, 0, cin, 0, &impl->control)) < 0)
pw_log_error("failed to link controls: %s", spa_strerror(res));
break;
}
}
spa_list_for_each(cin, &port->control_list[SPA_DIRECTION_INPUT], port_link) {
spa_list_for_each(cout, &target->control_list[SPA_DIRECTION_OUTPUT], port_link) {
if ((res = pw_control_link(cout, cin)) < 0)
if ((res = pw_control_add_link(cout, 0, cin, 0, &impl->notify)) < 0)
pw_log_error("failed to link controls: %s", spa_strerror(res));
break;
}
}
}
@ -868,7 +872,8 @@ static int impl_node_process(struct spa_node *node)
if (impl->direction == SPA_DIRECTION_OUTPUT) {
if (!(status & SPA_STATUS_HAVE_BUFFER))
spa_log_warn(this->log, "%p: process underrun", this);
spa_log_warn(this->log, "%p: '%s' id:%d underrun",
this, impl->this.node->info.name, impl->this.node->info.id);
trigger = status & SPA_STATUS_NEED_BUFFER;
}
else