smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

MCU: bring back foldbacks with correct sorting

Browse source
This commit is contained in:
Franke Burgarino 2025-08-22 13:54:53 -05:00
parent bb13bd48b2
commit 75f8aa3673
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -255,20 +255,28 @@ struct mcpStripableSorter
{ {
bool operator () (const std::shared_ptr<Stripable> & a, const std::shared_ptr<Stripable> & b) const bool operator () (const std::shared_ptr<Stripable> & a, const std::shared_ptr<Stripable> & b) const
{ {
if (!(a->is_monitor() || b->is_monitor() || a->is_master() || b->is_master())) { if (!(a->is_monitor() || b->is_monitor() ||
a->is_master() || b->is_master() ||
a->is_foldbackbus() || b->is_foldbackbus())) {
return a->presentation_info().order() < b->presentation_info().order(); return a->presentation_info().order() < b->presentation_info().order();
} }
int cmp_a = 0; int cmp_a = 0;
int cmp_b = 0; int cmp_b = 0;
if (a->is_master ()) { cmp_a = 1; } if (a->is_foldbackbus()) { cmp_a = 1; }
if (b->is_master ()) { cmp_b = 1; } if (b->is_foldbackbus()) { cmp_b = 1; }
if (a->is_monitor ()) { cmp_a = 2; } if (a->is_master ()) { cmp_a = 2; }
if (b->is_monitor ()) { cmp_b = 2; } if (b->is_master ()) { cmp_b = 2; }
if (a->is_monitor ()) { cmp_a = 3; }
if (b->is_monitor ()) { cmp_b = 3; }
if (cmp_a == cmp_b) {
return a->presentation_info().order() < b->presentation_info().order();
} else {
return cmp_a < cmp_b; return cmp_a < cmp_b;
} }
}
}; };
MackieControlProtocol::Sorted MackieControlProtocol::Sorted
@ -279,7 +287,7 @@ MackieControlProtocol::get_sorted_stripables()
// fetch all stripables // fetch all stripables
StripableList stripables; StripableList stripables;
session->get_stripables (stripables); session->get_stripables (stripables, PresentationInfo::AllStripables);
// sort in presentation order, and exclude master, control and hidden stripables // sort in presentation order, and exclude master, control and hidden stripables
// and any stripables that are already set. // and any stripables that are already set.