ardour/livetrax
13
0
Fork 0
Code

US2400: build-fix: need some IFDEFs for Mixbus.

Browse Source
This commit is contained in:
Ben Loftis 2021-08-03 10:54:21 -05:00
parent f13acad7ed
commit 193cebc912
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,6 +216,7 @@ US2400Protocol::stripable_is_locked_to_strip (boost::shared_ptr<Stripable> r) co
return false; return false;
} }
#ifdef MIXBUS
struct StripableByMixbusOrder struct StripableByMixbusOrder
{ {
bool operator () (const boost::shared_ptr<Stripable> & a, const boost::shared_ptr<Stripable> & b) const bool operator () (const boost::shared_ptr<Stripable> & a, const boost::shared_ptr<Stripable> & b) const
@ -233,6 +234,7 @@ struct StripableByMixbusOrder
return a->mixbus() < b->mixbus(); return a->mixbus() < b->mixbus();
} }
}; };
#endif
// predicate for sort call in get_sorted_stripables // predicate for sort call in get_sorted_stripables
struct StripableByPresentationOrder struct StripableByPresentationOrder
@ -305,11 +307,15 @@ US2400Protocol::get_sorted_stripables()
} }
} }
#ifdef MIXBUS
if (_view_mode == Busses) { if (_view_mode == Busses) {
sort (sorted.begin(), sorted.end(), StripableByMixbusOrder()); sort (sorted.begin(), sorted.end(), StripableByMixbusOrder());
} else { } else {
sort (sorted.begin(), sorted.end(), StripableByPresentationOrder()); sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
} }
#else
sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
#endif
return sorted; return sorted;
} }