ardour/livetrax
13
0
Fork 0
Code

Mackie Control: Use view names from Mackie spec and define them all

Browse Source
This commit is contained in:
Todd Naugle 2021-08-10 17:18:07 -05:00 committed by Robin Gareus
parent de0893cc8d
commit db8262bd7b
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -329,8 +329,6 @@ MackieControlProtocol::get_sorted_stripables()
sorted.push_back (s);
}
break;
case Plugins:
break;
case Auxes: // in ardour, for now aux and buss are same. for mixbus, "Busses" are mixbuses, "Auxes" are ardour buses
#ifdef MIXBUS
if (!s->mixbus() && !is_track(s) && !s->presentation_info().hidden())
@ -341,7 +339,7 @@ MackieControlProtocol::get_sorted_stripables()
sorted.push_back (s);
}
break;
case Hidden: // Show all the tracks we have hidden
case Outputs: // Show all the tracks we have hidden
if (s->presentation_info().hidden()) {
// maybe separate groups
sorted.push_back (s);

9
libs/surfaces/mackie/mackie_control_protocol.h
View File

@ -92,13 +92,14 @@ class MackieControlProtocol
enum ViewMode {
Mixer,
AudioTracks,
MidiTracks,
Busses,
Inputs,
AudioTracks,
AudioInstr,
Auxes,
Busses,
Outputs,
Selected,
Hidden,
Plugins,
};
enum FlipMode {

2
libs/surfaces/mackie/mcp_buttons.cc
View File

@ -1116,7 +1116,7 @@ MackieControlProtocol::outputs_press (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::outputs_release (Mackie::Button&)
{
set_view_mode (Hidden);
set_view_mode (Outputs);
return none;
}
Mackie::LedState

10
libs/surfaces/mackie/surface.cc
View File

@ -1330,11 +1330,6 @@ Surface::update_view_mode_display (bool with_helpful_text)
id = Button::MidiTracks;
text = _("MIDI Tracks");
break;
case MackieControlProtocol::Plugins:
show_two_char_display ("PL");
id = Button::Plugin;
text = _("Plugins");
break;
case MackieControlProtocol::Busses:
show_two_char_display ("BS");
id = Button::Busses;
@ -1349,7 +1344,7 @@ Surface::update_view_mode_display (bool with_helpful_text)
id = Button::Aux;
text = _("Auxes");
break;
case MackieControlProtocol::Hidden:
case MackieControlProtocol::Outputs:
show_two_char_display ("HI");
id = Button::Outputs;
text = _("Hidden Tracks");
@ -1372,6 +1367,9 @@ Surface::update_view_mode_display (bool with_helpful_text)
view_mode_buttons.push_back (Button::Aux);
view_mode_buttons.push_back (Button::Outputs);
view_mode_buttons.push_back (Button::User);
view_mode_buttons.push_back (Button::Inputs);
view_mode_buttons.push_back (Button::AudioInstruments);
view_mode_buttons.push_back (Button::Outputs);
if (id >= 0) {