mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: fix port sort

Browse source 
When the nodes are equal, sort playback ports befor monitor ports.
Then sort by system-id (port-id) and then by serial number.

See #2260
This commit is contained in:
Wim Taymans 2022-04-02 09:42:22 +02:00
parent a2e98e28c1
commit 5b01a2e738
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5411,14 +5411,14 @@ static int port_compare_func(const void *v1, const void *v2)
res = is_def2 - is_def1; res = is_def2 - is_def1;
else if ((*o1)->port.priority != (*o2)->port.priority) else if ((*o1)->port.priority != (*o2)->port.priority)
res = (*o2)->port.priority - (*o1)->port.priority; res = (*o2)->port.priority - (*o1)->port.priority;
else if ((res = (*o1)->port.node_id - (*o2)->port.node_id)) { else if ((res = (*o1)->port.node_id - (*o2)->port.node_id) == 0) {
if ((*o1)->port.is_monitor != (*o2)->port.is_monitor)
res = (*o1)->port.is_monitor - (*o2)->port.is_monitor;
if (res == 0) if (res == 0)
res = (*o1)->port.system_id - (*o2)->port.system_id; res = (*o1)->port.system_id - (*o2)->port.system_id;
if (res == 0) if (res == 0)
res = (*o1)->serial - (*o2)->serial; res = (*o1)->serial - (*o2)->serial;
} }
pw_log_debug("port %s<->%s type:%d<->%d def:%d<->%d prio:%d<->%d id:%d<->%d res:%d", pw_log_debug("port %s<->%s type:%d<->%d def:%d<->%d prio:%d<->%d id:%d<->%d res:%d",
(*o1)->port.name, (*o2)->port.name, (*o1)->port.name, (*o2)->port.name,
(*o1)->port.type_id, (*o2)->port.type_id, (*o1)->port.type_id, (*o2)->port.type_id,