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

jack: keep midi ports on the midi-bridge client

Browse source 
Separating them causes problems because there is no actual
client for the resulting ports then.
This commit is contained in:
Wim Taymans 2021-03-04 18:06:07 +01:00
parent d98d947e54
commit 0ad603375f
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pipewire-jack/src/pipewire-jack.c
View file

@ -112,7 +112,6 @@ struct object {
char name[JACK_CLIENT_NAME_SIZE+1]; char name[JACK_CLIENT_NAME_SIZE+1];
int32_t priority; int32_t priority;
uint32_t client_id; uint32_t client_id;
bool is_bridge;
} node; } node;
struct { struct {
uint32_t src; uint32_t src;
@ -2126,9 +2125,6 @@ static void registry_event_global(void *data, uint32_t id,
app = spa_dict_lookup(props, PW_KEY_APP_NAME); app = spa_dict_lookup(props, PW_KEY_APP_NAME);
if ((str = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS)) != NULL)
o->node.is_bridge = strstr(str, "Bridge") != NULL;
if (c->short_name) { if (c->short_name) {
str = spa_dict_lookup(props, PW_KEY_NODE_NICK); str = spa_dict_lookup(props, PW_KEY_NODE_NICK);
if (str == NULL) if (str == NULL)
@ -2237,9 +2233,7 @@ static void registry_event_global(void *data, uint32_t id,
if (ot == NULL || ot->type != INTERFACE_Node) if (ot == NULL || ot->type != INTERFACE_Node)
goto exit_free; goto exit_free;
if (ot->node.is_bridge && strchr(str, ':') != NULL) if (is_monitor && !c->merge_monitor)
snprintf(tmp, sizeof(tmp), "%s", str);
else if (is_monitor && !c->merge_monitor)
snprintf(tmp, sizeof(tmp), "%.*s%s:%s", snprintf(tmp, sizeof(tmp), "%.*s%s:%s",
(int)(JACK_CLIENT_NAME_SIZE-(sizeof(MONITOR_EXT)-1)), (int)(JACK_CLIENT_NAME_SIZE-(sizeof(MONITOR_EXT)-1)),
ot->node.name, MONITOR_EXT, str); ot->node.name, MONITOR_EXT, str);