ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

US2400: Fix order of mixbuses in Flip mode (Mixbus only)

Browse Source
This commit is contained in:
Ben Loftis 2021-08-03 10:38:07 -05:00
parent 398a1efbd5
commit 521117054e
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/surfaces/us2400/us2400_control_protocol.cc
View File

@ -216,6 +216,24 @@ US2400Protocol::stripable_is_locked_to_strip (boost::shared_ptr<Stripable> r) co
return false;
}
struct StripableByMixbusOrder
{
bool operator () (const boost::shared_ptr<Stripable> & a, const boost::shared_ptr<Stripable> & b) const
{
return a->mixbus() < b->mixbus();
}
bool operator () (const Stripable & a, const Stripable & b) const
{
return a.mixbus() < b.mixbus();
}
bool operator () (const Stripable * a, const Stripable * b) const
{
return a->mixbus() < b->mixbus();
}
};
// predicate for sort call in get_sorted_stripables
struct StripableByPresentationOrder
{
@ -267,7 +285,7 @@ US2400Protocol::get_sorted_stripables()
#ifdef MIXBUS
if (!s->presentation_info().hidden() && !s->mixbus()) {
#else
if (!s->presentation_info().hidden()) {
if (is_track(s) && !s->presentation_info().hidden()) {
#endif
sorted.push_back (s);
}
@ -287,7 +305,11 @@ US2400Protocol::get_sorted_stripables()
}
}
sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
if (_view_mode == Busses) {
sort (sorted.begin(), sorted.end(), StripableByMixbusOrder());
} else {
sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
}
return sorted;
}