ardour/livetrax
13
0
Fork 0
Code

OSC: master/monitor forced to sort at end

Browse Source
This commit is contained in:
Len Ovens 2016-06-22 14:50:13 -07:00
parent 844bf70002
commit f3dd9eef8b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/surfaces/osc/osc.cc
View File

@ -2581,12 +2581,6 @@ OSC::get_sorted_stripables(std::bitset<32> types)
if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) { if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) {
sorted.push_back (s); sorted.push_back (s);
} else } else
if (types[5] && (s->presentation_info().flags() & PresentationInfo::MasterOut)) {
sorted.push_back (s);
} else
if (types[6] && (s->presentation_info().flags() & PresentationInfo::MonitorOut)) {
sorted.push_back (s);
} else
if (types[8] && (s->presentation_info().flags() & PresentationInfo::Selected)) { if (types[8] && (s->presentation_info().flags() & PresentationInfo::Selected)) {
sorted.push_back (s); sorted.push_back (s);
} else } else
@ -2596,6 +2590,13 @@ OSC::get_sorted_stripables(std::bitset<32> types)
} }
} }
sort (sorted.begin(), sorted.end(), StripableByPresentationOrder()); sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
// Master/Monitor might be anywhere... we put them at the end - Sorry ;)
if (types[5]) {
sorted.push_back (session->master_out());
}
if (types[6]) {
sorted.push_back (session->monitor_out());
}
return sorted; return sorted;
} }