ardour/livetrax
13
0
Fork 0
Code

Move implementation out of header file

Browse Source
This commit is contained in:
Robin Gareus 2017-06-17 14:50:28 +02:00
parent f80958e168
commit c02a3413e1
2 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libs/ardour/ardour/stripable.h
View File

@ -91,64 +91,7 @@ class LIBARDOUR_API Stripable : public SessionObject,
{
bool _mixer_order; // master is last
Sorter (bool mixer_order = false) : _mixer_order (mixer_order) {}
bool operator() (boost::shared_ptr<ARDOUR::Stripable> a, boost::shared_ptr<ARDOUR::Stripable> b)
{
if (a->presentation_info().flags () == b->presentation_info().flags ()) {
return a->presentation_info().order() < b->presentation_info().order();
}
int cmp_a = 0;
int cmp_b = 0;
if (a->is_auditioner ()) { cmp_a = -2; }
if (b->is_auditioner ()) { cmp_b = -2; }
if (a->is_monitor ()) { cmp_a = -1; }
if (b->is_monitor ()) { cmp_b = -1; }
/* ARDOUR-Editor: [Track|Bus|Master] (0) < VCA (3)
* ARDOUR-Mixer : [Track|Bus] (0) < VCA (3) < Master (4)
*
* Mixbus-Editor: [Track|Bus] (0) < Mixbus (1) < VCA (3) < Master (4)
* Mixbus-Mixer : [Track|Bus] (0) < Mixbus (1) < Master (2) < VCA (3)
*/
if (a->presentation_info().flags () & ARDOUR::PresentationInfo::VCA) {
cmp_a = 3;
}
#ifdef MIXBUS
else if (a->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut) {
cmp_a = _mixer_order ? 2 : 4;
}
else if ((a->presentation_info().flags () & ARDOUR::PresentationInfo::Mixbus) || a->mixbus()) {
cmp_a = 1;
}
#endif
else if (_mixer_order && (a->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut)) {
cmp_a = 4;
}
if (b->presentation_info().flags () & ARDOUR::PresentationInfo::VCA) {
cmp_b = 3;
}
#ifdef MIXBUS
else if (b->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut) {
cmp_b = _mixer_order ? 2 : 4;
}
else if ((b->presentation_info().flags () & ARDOUR::PresentationInfo::Mixbus) || b->mixbus()) {
cmp_b = 1;
}
#endif
else if (_mixer_order && (b->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut)) {
cmp_b = 4;
}
if (cmp_a == cmp_b) {
return a->presentation_info().order() < b->presentation_info().order();
}
return cmp_a < cmp_b;
}
bool operator() (boost::shared_ptr<ARDOUR::Stripable> a, boost::shared_ptr<ARDOUR::Stripable> b);
};
/* gui's call this for their own purposes. */

59
libs/ardour/stripable.cc
View File

@ -123,3 +123,62 @@ Stripable::is_selected() const
}
return _session.selection().selected (shared_from_this());
}
bool
Stripable::Sorter::operator() (boost::shared_ptr<ARDOUR::Stripable> a, boost::shared_ptr<ARDOUR::Stripable> b)
{
if (a->presentation_info().flags () == b->presentation_info().flags ()) {
return a->presentation_info().order() < b->presentation_info().order();
}
int cmp_a = 0;
int cmp_b = 0;
if (a->is_auditioner ()) { cmp_a = -2; }
if (b->is_auditioner ()) { cmp_b = -2; }
if (a->is_monitor ()) { cmp_a = -1; }
if (b->is_monitor ()) { cmp_b = -1; }
/* ARDOUR-Editor: [Track|Bus|Master] (0) < VCA (3)
* ARDOUR-Mixer : [Track|Bus] (0) < VCA (3) < Master (4)
*
* Mixbus-Editor: [Track|Bus] (0) < Mixbus (1) < VCA (3) < Master (4)
* Mixbus-Mixer : [Track|Bus] (0) < Mixbus (1) < Master (2) < VCA (3)
*/
if (a->presentation_info().flags () & ARDOUR::PresentationInfo::VCA) {
cmp_a = 3;
}
#ifdef MIXBUS
else if (a->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut) {
cmp_a = _mixer_order ? 2 : 4;
}
else if ((a->presentation_info().flags () & ARDOUR::PresentationInfo::Mixbus) || a->mixbus()) {
cmp_a = 1;
}
#endif
else if (_mixer_order && (a->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut)) {
cmp_a = 4;
}
if (b->presentation_info().flags () & ARDOUR::PresentationInfo::VCA) {
cmp_b = 3;
}
#ifdef MIXBUS
else if (b->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut) {
cmp_b = _mixer_order ? 2 : 4;
}
else if ((b->presentation_info().flags () & ARDOUR::PresentationInfo::Mixbus) || b->mixbus()) {
cmp_b = 1;
}
#endif
else if (_mixer_order && (b->presentation_info().flags () & ARDOUR::PresentationInfo::MasterOut)) {
cmp_b = 4;
}
if (cmp_a == cmp_b) {
return a->presentation_info().order() < b->presentation_info().order();
}
return cmp_a < cmp_b;
}