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

jack: improve properties

Browse source
This commit is contained in:
Wim Taymans 2019-09-23 20:50:12 +02:00
parent b85b88b53d
commit 8d8ef587f5
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pipewire-jack.c
View file

@ -1702,8 +1702,8 @@ static void registry_event_global(void *data, uint32_t id,
switch (type) { switch (type) {
case PW_TYPE_INTERFACE_Node: case PW_TYPE_INTERFACE_Node:
if ((str = spa_dict_lookup(props, PW_KEY_NODE_NICK)) == NULL && if ((str = spa_dict_lookup(props, PW_KEY_NODE_DESCRIPTION)) == NULL &&
(str = spa_dict_lookup(props, PW_KEY_NODE_DESCRIPTION)) == NULL && (str = spa_dict_lookup(props, PW_KEY_NODE_NICK)) == NULL &&
(str = spa_dict_lookup(props, PW_KEY_NODE_NAME)) == NULL) { (str = spa_dict_lookup(props, PW_KEY_NODE_NAME)) == NULL) {
str = "node"; str = "node";
} }
@ -1780,12 +1780,12 @@ static void registry_event_global(void *data, uint32_t id,
o->port.port_id = SPA_ID_INVALID; o->port.port_id = SPA_ID_INVALID;
} }
if ((str = spa_dict_lookup(props, PW_KEY_PORT_ALIAS1)) != NULL) if ((str = spa_dict_lookup(props, PW_KEY_OBJECT_PATH)) != NULL)
snprintf(o->port.alias1, sizeof(o->port.alias1), "%s", str); snprintf(o->port.alias1, sizeof(o->port.alias1), "%s", str);
else else
o->port.alias1[0] = '\0'; o->port.alias1[0] = '\0';
if ((str = spa_dict_lookup(props, PW_KEY_PORT_ALIAS2)) != NULL) if ((str = spa_dict_lookup(props, PW_KEY_PORT_ALIAS)) != NULL)
snprintf(o->port.alias2, sizeof(o->port.alias2), "%s", str); snprintf(o->port.alias2, sizeof(o->port.alias2), "%s", str);
else else
o->port.alias2[0] = '\0'; o->port.alias2[0] = '\0';
@ -3065,11 +3065,11 @@ int jack_port_set_alias (jack_port_t *port, const char *alias)
pw_thread_loop_lock(c->context.loop); pw_thread_loop_lock(c->context.loop);
if (o->port.alias1[0] == '\0') { if (o->port.alias1[0] == '\0') {
key = PW_KEY_PORT_ALIAS1; key = PW_KEY_OBJECT_PATH;
snprintf(o->port.alias1, sizeof(o->port.alias1), "%s", alias); snprintf(o->port.alias1, sizeof(o->port.alias1), "%s", alias);
} }
else if (o->port.alias2[0] == '\0') { else if (o->port.alias2[0] == '\0') {
key = PW_KEY_PORT_ALIAS2; key = PW_KEY_PORT_ALIAS;
snprintf(o->port.alias2, sizeof(o->port.alias2), "%s", alias); snprintf(o->port.alias2, sizeof(o->port.alias2), "%s", alias);
} }
else else
@ -3115,9 +3115,9 @@ int jack_port_unset_alias (jack_port_t *port, const char *alias)
pw_thread_loop_lock(c->context.loop); pw_thread_loop_lock(c->context.loop);
if (strcmp(o->port.alias1, alias) == 0) if (strcmp(o->port.alias1, alias) == 0)
key = PW_KEY_PORT_ALIAS1; key = PW_KEY_OBJECT_PATH;
else if (strcmp(o->port.alias2, alias) == 0) else if (strcmp(o->port.alias2, alias) == 0)
key = PW_KEY_PORT_ALIAS2; key = PW_KEY_PORT_ALIAS;
else else
goto error; goto error;