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

MCU: clean up MackieControlProtocol::get_sorted_stripables logic

Browse source
This commit is contained in:
Franke Burgarino 2025-08-22 13:58:52 -05:00 • committed by Edgar Aichinger
parent a5a8246257
commit 18b027d1d0
1 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -296,6 +296,8 @@ MackieControlProtocol::get_sorted_stripables()
std::shared_ptr<Stripable> s = *it; std::shared_ptr<Stripable> s = *it;
if (s->is_auditioner()) { continue; }
if (s->is_hidden()) { continue; }
if (this->device_info().has_master_fader() && s->presentation_info().special()) { if (this->device_info().has_master_fader() && s->presentation_info().special()) {
continue; continue;
} }
@ -308,50 +310,46 @@ MackieControlProtocol::get_sorted_stripables()
switch (_view_mode) { switch (_view_mode) {
case Mixer: case Mixer:
if ((!this->device_info().has_master_fader() && (s == this->get_session().master_out() || s == this->get_session().monitor_out())) || !s->presentation_info().hidden()) { sorted.push_back (s);
sorted.push_back (s);
}
break; break;
case AudioTracks: case AudioTracks:
if (is_audio_track(s) && !s->presentation_info().hidden()) { if (is_audio_track(s)) {
sorted.push_back (s); sorted.push_back (s);
} }
break; break;
case Busses: case Busses:
if (Profile->get_mixbus()) {
#ifdef MIXBUS #ifdef MIXBUS
if (s->mixbus()) { if (s->mixbus()) {
sorted.push_back (s); sorted.push_back (s);
}
#endif
} else {
if (!is_track (s) && !is_vca (s) && !is_foldback_bus (s) && !s->presentation_info().hidden()) {
sorted.push_back (s);
}
} }
#else
if (is_bus(s)) {
sorted.push_back (s);
}
#endif
break; break;
case MidiTracks: case MidiTracks:
if (is_midi_track(s) && !s->presentation_info().hidden()) { if (is_midi_track(s)) {
sorted.push_back (s); sorted.push_back (s);
} }
break; break;
case Auxes: // in ardour, for now aux and buss are same. for mixbus, "Busses" are mixbuses, "Auxes" are ardour buses case Auxes: // in ardour, for now aux and buss are same. for mixbus, "Busses" are mixbuses, "Auxes" are ardour buses
#ifdef MIXBUS #ifdef MIXBUS
if (!s->mixbus() && !is_track(s) && !is_vca (s) && !is_foldback_bus (s) && !s->presentation_info().hidden()) if (is_bus(s) && !s->mixbus())
#else #else
if (!is_track (s) && !is_vca (s) && !is_foldback_bus (s) && !s->presentation_info().hidden()) if (is_bus(s))
#endif #endif
{ {
sorted.push_back (s); sorted.push_back (s);
} }
break; break;
case Outputs: case Outputs:
if (is_foldback_bus (s) && !s->presentation_info().hidden()) { if (is_foldback_bus (s)) {
sorted.push_back (s); sorted.push_back (s);
} }
break; break;
case Selected: // For example: a group (this is USER) case Selected: // For example: a group (this is USER)
if (s->is_selected() && !s->presentation_info().hidden()) { if (s->is_selected()) {
sorted.push_back (s); sorted.push_back (s);
} }
break; break;
@ -361,7 +359,7 @@ MackieControlProtocol::get_sorted_stripables()
} }
break; break;
case Inputs: case Inputs:
if (is_trigger_track (s) && !s->presentation_info().hidden()){ if (is_trigger_track (s)){
sorted.push_back (s); sorted.push_back (s);
} }
break; break;