smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

MCU: show surround master in global/mixer view

Browse source 
only if the controller doesn't have a master fader
This commit is contained in:
Franke Burgarino 2025-08-22 14:47:48 -05:00 • committed by Edgar Aichinger
parent 18b027d1d0
commit 78bf5022d8
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -255,8 +255,7 @@ struct mcpStripableSorter
{ {
bool operator () (const std::shared_ptr<Stripable> & a, const std::shared_ptr<Stripable> & b) const bool operator () (const std::shared_ptr<Stripable> & a, const std::shared_ptr<Stripable> & b) const
{ {
if (!(a->is_monitor() || b->is_monitor() || if (!(a->presentation_info().special() || b->presentation_info().special() ||
a->is_master() || b->is_master() ||
a->is_foldbackbus() || b->is_foldbackbus())) { a->is_foldbackbus() || b->is_foldbackbus())) {
return a->presentation_info().order() < b->presentation_info().order(); return a->presentation_info().order() < b->presentation_info().order();
} }
@ -264,12 +263,14 @@ struct mcpStripableSorter
int cmp_a = 0; int cmp_a = 0;
int cmp_b = 0; int cmp_b = 0;
if (a->is_foldbackbus()) { cmp_a = 1; } if (a->is_foldbackbus ()) { cmp_a = 1; }
if (b->is_foldbackbus()) { cmp_b = 1; } if (b->is_foldbackbus ()) { cmp_b = 1; }
if (a->is_master ()) { cmp_a = 2; } if (a->is_master ()) { cmp_a = 2; }
if (b->is_master ()) { cmp_b = 2; } if (b->is_master ()) { cmp_b = 2; }
if (a->is_monitor ()) { cmp_a = 3; } if (a->is_monitor ()) { cmp_a = 3; }
if (b->is_monitor ()) { cmp_b = 3; } if (b->is_monitor ()) { cmp_b = 3; }
if (a->is_surround_master ()) { cmp_a = 4; }
if (b->is_surround_master ()) { cmp_b = 4; }
if (cmp_a == cmp_b) { if (cmp_a == cmp_b) {
return a->presentation_info().order() < b->presentation_info().order(); return a->presentation_info().order() < b->presentation_info().order();