mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

impl-port: keep auto-generated port.alias in sync

Browse source 
When the port.alias was auto-generated from the port.name, make sure we
update it when the port.name changes.

See #4851
This commit is contained in:
Wim Taymans 2025-08-18 11:28:15 +02:00
parent 1d437dfb8e
commit 3643c468e4
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/pipewire/impl-port.c
View file

@ -463,6 +463,29 @@ static int update_properties(struct pw_impl_port *port, const struct spa_dict *d
int changed;
changed = pw_properties_update_ignore(port->properties, dict, filter ? ignored : NULL);
if (changed) {
const char *name, *alias;
name = spa_dict_lookup(dict, PW_KEY_PORT_NAME);
alias = spa_dict_lookup(dict, PW_KEY_PORT_ALIAS);
if (alias != NULL) {
/* alias was explicitly updated, don't generate one from
* the port.name */
port->alias_port_name = false;
}
else if (name != NULL && port->alias_port_name) {
const struct pw_properties *nprops = pw_impl_node_get_properties(port->node);
const char *node_desc = pw_properties_get(nprops, PW_KEY_NODE_DESCRIPTION);
const char *node_nick = pw_properties_get(nprops, PW_KEY_NODE_NICK);
const char *node_name = pw_properties_get(nprops, PW_KEY_NODE_NAME);
const char *str;
if ((str = node_nick) == NULL && (str = node_desc) == NULL && (str = node_name) == NULL)
str = "node";
pw_properties_setf(port->properties, PW_KEY_PORT_ALIAS, "%s:%s", str, name);
}
}
port->info.props = &port->properties->dict;
if (changed) {
@ -1315,9 +1338,11 @@ int pw_impl_port_add(struct pw_impl_port *port, struct pw_impl_node *node)
if (is_control)
pw_properties_setf(port->properties, PW_KEY_PORT_ALIAS, "%s:%s",
str, prefix);
else
else {
pw_properties_setf(port->properties, PW_KEY_PORT_ALIAS, "%s:%s",
str, pw_properties_get(port->properties, PW_KEY_PORT_NAME));
port->alias_port_name = true;
}
}
port->info.props = &port->properties->dict;

1
src/pipewire/private.h
View file

@ -957,6 +957,7 @@ struct pw_impl_port {
} rt; /**< data only accessed from the data thread */
unsigned int destroying:1;
unsigned int passive:1;
unsigned int alias_port_name:1;
int busy_count;
struct spa_latency_info latency[2]; /**< latencies */