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

jack: improve port sort order

Browse source 
Sort by object path before attepting by id.
This commit is contained in:
Wim Taymans 2019-11-15 13:31:22 +01:00
parent 81bf9cd488
commit 40e837555d
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3624,14 +3624,20 @@ int jack_recompute_total_latency (jack_client_t *client, jack_port_t* port)
static int port_compare_func(const void *v1, const void *v2)
{
const struct object *const*o1 = v1, *const*o2 = v2;
int res;
if ((*o1)->port.type_id != (*o2)->port.type_id)
return (*o1)->port.type_id - (*o2)->port.type_id;
res = (*o1)->port.type_id - (*o2)->port.type_id;
else if ((*o1)->port.priority != (*o2)->port.priority)
res = (*o2)->port.priority - (*o1)->port.priority;
else if ((res = strcmp((*o1)->port.alias1, (*o2)->port.alias1) == 0))
res = (*o1)->id - (*o2)->id;
if ((*o1)->port.priority != (*o2)->port.priority)
return (*o2)->port.priority - (*o1)->port.priority;
return (*o1)->id - (*o2)->id;
pw_log_debug("port type:%d<->%d prio:%d<->%d id:%d<->%d res:%d",
(*o1)->port.type_id, (*o2)->port.type_id,
(*o1)->port.priority, (*o2)->port.priority,
(*o1)->id, (*o2)->id, res);
return res;
}
SPA_EXPORT