diff options
| author | Robin Gareus <robin@gareus.org> | 2016-11-27 22:54:05 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-11-27 22:54:23 +0100 |
| commit | 1de584961a746090583a4c97251f25924d6e03ad (patch) | |
| tree | 6cc66baec95fde2dbf91d7c1a02f26026a149142 /libs/surfaces | |
| parent | 5ec21347a9595a88d7d1e935a5e4a271bdfb7933 (diff) | |
NO-OP; Backport changes from Mixbus branch
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mcp_buttons.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 2ea61cc9f0..1a73ad56b9 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -320,7 +320,7 @@ MackieControlProtocol::get_sorted_stripables() 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->presentation_info().hidden()) + if (!s->mixbus() && !is_track(s) && !s->presentation_info().hidden()) #else if (!is_track(s) && !s->presentation_info().hidden()) #endif diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 5f3d2766c8..3fbc846111 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -934,6 +934,9 @@ MackieControlProtocol::miditracks_release (Mackie::Button&) Mackie::LedState MackieControlProtocol::inputs_press (Mackie::Button&) { +#ifdef MIXBUS + set_view_mode (Mixer); //in Mixbus, this is the same as Global View (avoid dead buttons) +#endif return none; } Mackie::LedState @@ -955,6 +958,9 @@ MackieControlProtocol::audiotracks_release (Mackie::Button&) Mackie::LedState MackieControlProtocol::audioinstruments_press (Mackie::Button& b) { +#ifdef MIXBUS + set_view_mode (MidiTracks); //in Mixbus, we do the same thing as MIDI Tracks ( aviod dead buttons ) +#endif return none; } diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 1c2fe8d1b9..e7ce72cff8 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -1341,6 +1341,12 @@ Strip::vpot_mode_string () default: break; } +#ifdef MIXBUS + //"None" mode, by definition (currently) shows the pan control above the fader. + //Mixbus controllers are created from a LADSPA so they don't have ac->desc().type + //For the forseeable future, we will just return "Pan" here. + return "Pan"; +#endif return "???"; } |