ardour/livetrax
13
0
Fork 0
Code

Micro optimization: query PI flags once

Browse Source 
This also removes a Mixbus special case, explicit ->mixbus() tests
are no longer required.
This commit is contained in:
Robin Gareus 2020-01-28 21:27:11 +01:00
parent 6b0a3cfffe
commit cb01a910d7
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/ardour/stripable.cc
View File

@ -129,7 +129,10 @@ Stripable::is_selected() const
bool bool
Stripable::Sorter::operator() (boost::shared_ptr<ARDOUR::Stripable> a, boost::shared_ptr<ARDOUR::Stripable> b) Stripable::Sorter::operator() (boost::shared_ptr<ARDOUR::Stripable> a, boost::shared_ptr<ARDOUR::Stripable> b)
{ {
if (a->presentation_info().flags () == b->presentation_info().flags ()) { const PresentationInfo::Flag a_flag = a->presentation_info().flags ();
const PresentationInfo::Flag b_flag = b->presentation_info().flags ();
if (a_flag == b_flag) {
return a->presentation_info().order() < b->presentation_info().order(); return a->presentation_info().order() < b->presentation_info().order();
} }
@ -148,34 +151,34 @@ Stripable::Sorter::operator() (boost::shared_ptr<ARDOUR::Stripable> a, boost::sh
* Mixbus-Mixer : [Track|Bus] (0) < Mixbus (1) < Master (2) < VCA (3) * Mixbus-Mixer : [Track|Bus] (0) < Mixbus (1) < Master (2) < VCA (3)
*/ */
if (a->presentation_info().flags () & ARDOUR::PresentationInfo::VCA) { if (a_flag & ARDOUR::PresentationInfo::VCA) {
cmp_a = 3; cmp_a = 3;
} }
#ifdef MIXBUS #ifdef MIXBUS
else if (a->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut) { else if (a_flag & ARDOUR::PresentationInfo::MasterOut) {
cmp_a = _mixer_order ? 2 : 4; cmp_a = _mixer_order ? 2 : 4;
} }
else if ((a->presentation_info().flags () & ARDOUR::PresentationInfo::Mixbus) || a->mixbus()) { else if (a_flag & ARDOUR::PresentationInfo::Mixbus) {
cmp_a = 1; cmp_a = 1;
} }
#endif #endif
else if (_mixer_order && (a->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut)) { else if (_mixer_order && (a_flag & ARDOUR::PresentationInfo::MasterOut)) {
cmp_a = 4; cmp_a = 4;
} }
if (b->presentation_info().flags () & ARDOUR::PresentationInfo::VCA) { if (b_flag & ARDOUR::PresentationInfo::VCA) {
cmp_b = 3; cmp_b = 3;
} }
#ifdef MIXBUS #ifdef MIXBUS
else if (b->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut) { else if (b_flag & ARDOUR::PresentationInfo::MasterOut) {
cmp_b = _mixer_order ? 2 : 4; cmp_b = _mixer_order ? 2 : 4;
} }
else if ((b->presentation_info().flags () & ARDOUR::PresentationInfo::Mixbus) || b->mixbus()) { else if (b_flag & ARDOUR::PresentationInfo::Mixbus) {
cmp_b = 1; cmp_b = 1;
} }
#endif #endif
else if (_mixer_order && (b->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut)) { else if (_mixer_order && (b_flag & ARDOUR::PresentationInfo::MasterOut)) {
cmp_b = 4; cmp_b = 4;
} }