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

port: emit signal after properties are set

Browse source 
So that we can use the node properties in the signal handler.
Also use the channel name of the port to make a port name.
This commit is contained in:
Wim Taymans 2018-10-08 11:43:57 +02:00
parent 595daf86c6
commit 6de03418ca
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pipewire/port.c
View file

@ -502,8 +502,6 @@ int pw_port_add(struct pw_port *port, struct pw_node *node)
if (find != NULL) if (find != NULL)
return -EEXIST; return -EEXIST;
pw_node_events_port_init(node, port);
if ((res = spa_node_port_get_info(node->node, if ((res = spa_node_port_get_info(node->node,
port->direction, port_id, port->direction, port_id,
&port->spa_info)) < 0) { &port->spa_info)) < 0) {
@ -525,6 +523,8 @@ int pw_port_add(struct pw_port *port, struct pw_node *node)
if (port->spa_info->props) if (port->spa_info->props)
pw_port_update_properties(port, port->spa_info->props); pw_port_update_properties(port, port->spa_info->props);
pw_node_events_port_init(node, port);
pw_port_for_each_param(port, SPA_PARAM_IO, 0, 0, NULL, check_param_io, port); pw_port_for_each_param(port, SPA_PARAM_IO, 0, 0, NULL, check_param_io, port);
dir = port->direction == PW_DIRECTION_INPUT ? "in" : "out"; dir = port->direction == PW_DIRECTION_INPUT ? "in" : "out";
@ -537,7 +537,12 @@ int pw_port_add(struct pw_port *port, struct pw_node *node)
} }
if ((str = pw_properties_get(port->properties, "port.name")) == NULL) { if ((str = pw_properties_get(port->properties, "port.name")) == NULL) {
pw_properties_setf(port->properties, "port.name", "%s_%d", dir, port_id); if ((str = pw_properties_get(port->properties, "port.channel")) != NULL) {
pw_properties_setf(port->properties, "port.name", "%s_%s", dir, str);
}
else {
pw_properties_setf(port->properties, "port.name", "%s_%d", dir, port_id);
}
} }
if (SPA_FLAG_CHECK(port->spa_info->flags, SPA_PORT_INFO_FLAG_PHYSICAL)) if (SPA_FLAG_CHECK(port->spa_info->flags, SPA_PORT_INFO_FLAG_PHYSICAL))