Mackie Protocol: Move buttons to more accurately reflect default mcp legends.

Modifiers are only modifiers (no actions directly on modifiers).
Punch indicators moved to Drop/Replace.
Added Save, Undo, Cancel (select none) and Enter (select all tracks)
Fixed click button.
Up&Down buttons now move the selected track up & down.

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 3ad6c8f1b13f1e2ef549fdf4e8cbc6be54b4c6dc..d9fa3340c7e0e41415aa1112b489e09f18154ffe 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -1187,9 +1187,9 @@ MackieControlProtocol::update_timecode_display()
 void MackieControlProtocol::notify_parameter_changed (std::string const & p)
 {
        if (p == "punch-in") {
-               update_global_button (Button::Save, session->config.get_punch_in() ? flashing : off);
+               update_global_button (Button::Drop, session->config.get_punch_in() ? flashing : off);
        } else if (p == "punch-out") {
-               update_global_button (Button::Undo, session->config.get_punch_out() ? flashing : off);
+               update_global_button (Button::Replace, session->config.get_punch_out() ? flashing : off);
        } else if (p == "clicking") {
                update_global_button (Button::Click, Config->get_clicking());
        } else if (p == "follow-edits") {

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 33672f0ee6524cc4d780f4f92fe18888d3ca3c9d..d3e17d0fcce46621404eb36d606f9367befcf527 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -427,8 +427,6 @@ class MackieControlProtocol
        Mackie::LedState channel_left_release(Mackie::Button &);
        Mackie::LedState channel_right_press(Mackie::Button &);
        Mackie::LedState channel_right_release(Mackie::Button &);
-       Mackie::LedState clicking_press(Mackie::Button &);
-       Mackie::LedState clicking_release(Mackie::Button &);
        Mackie::LedState marker_press(Mackie::Button &);
        Mackie::LedState marker_release(Mackie::Button &);
        Mackie::LedState save_press(Mackie::Button &);

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index bff011668fdb64314cefb23adb761ac2be4ca846..6bdbbe2b71ba4dc0741a7421c7de6336180e4de7 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -60,7 +60,6 @@ LedState
 MackieControlProtocol::option_press (Button &)
 {
        _modifier_state |= MODIFIER_OPTION;
-       access_action ("Editor/set-loop-from-edit-range");
        return on;
 }
 LedState
@@ -74,7 +73,6 @@ MackieControlProtocol::control_press (Button &)
 {
        _modifier_state |= MODIFIER_CONTROL;
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("CONTROL Press: modifier state now set to %1\n", _modifier_state));
-       access_action ("Editor/set-punch-from-edit-range");
        return on;
 }
 LedState
@@ -88,7 +86,6 @@ LedState
 MackieControlProtocol::cmd_alt_press (Button &)
 {
        _modifier_state |= MODIFIER_CMDALT;
-       access_action ("Editor/set-session-from-edit-range");
        return on;
 }
 LedState
@@ -235,7 +232,7 @@ MackieControlProtocol::cursor_up_press (Button&)
                        VerticalZoomInAll (); /* EMIT SIGNAL */
                }
        } else {
-               StepTracksUp (); /* EMIT SIGNAL */
+               access_action ("Editor/select-prev-route");
        }
        return off;
 }
@@ -256,7 +253,7 @@ MackieControlProtocol::cursor_down_press (Button&)
                        VerticalZoomOutAll (); /* EMIT SIGNAL */
                }
        } else {
-               StepTracksDown (); /* EMIT SIGNAL */
+               access_action ("Editor/select-next-route");
        }
        return off;
 }
@@ -346,7 +343,11 @@ MackieControlProtocol::scrub_release (Mackie::Button &)
 LedState
 MackieControlProtocol::undo_press (Button&)
 {
-       toggle_punch_out ();
+       if (main_modifier_state() == MODIFIER_SHIFT) {
+               redo();
+       } else {
+               undo ();
+       }
        return none;
 }
 
@@ -359,7 +360,11 @@ MackieControlProtocol::undo_release (Button&)
 LedState
 MackieControlProtocol::drop_press (Button &)
 {
-       access_action ("Editor/start-range-from-playhead");
+       if (main_modifier_state() == MODIFIER_SHIFT) {
+               toggle_punch_in();
+       } else {
+               access_action ("Editor/start-range-from-playhead");
+       }
        return none;
 }
 
@@ -372,7 +377,12 @@ MackieControlProtocol::drop_release (Button &)
 LedState
 MackieControlProtocol::save_press (Button &)
 {
-       toggle_punch_in ();
+       if (main_modifier_state() == MODIFIER_SHIFT) {
+               quick_snapshot_switch();
+       } else {
+               save_state ();
+       }
+       
        return none;
 }
 
@@ -545,9 +555,14 @@ MackieControlProtocol::ffwd_release (Button &)
 LedState
 MackieControlProtocol::loop_press (Button &)
 {
-       bool was_on = session->get_play_loop();
-       session->request_play_loop (!was_on);
-       return was_on ? off : on;
+       if (main_modifier_state() & MODIFIER_SHIFT) {
+               access_action ("Editor/set-loop-from-edit-range");
+               return off;
+       } else {
+               bool was_on = session->get_play_loop();
+               session->request_play_loop (!was_on);
+               return was_on ? off : on;
+       }
 }
 
 LedState
@@ -556,24 +571,14 @@ MackieControlProtocol::loop_release (Button &)
        return none;
 }
 
-LedState
-MackieControlProtocol::clicking_press (Button &)
-{
-       bool state = !Config->get_clicking();
-       Config->set_clicking (state);
-       return state;
-}
-
-LedState
-MackieControlProtocol::clicking_release (Button &)
-{
-       return Config->get_clicking();
-}
-
 LedState
 MackieControlProtocol::enter_press (Button &)
 {
-       access_action ("Transport/ToggleFollowEdits");
+       if (main_modifier_state() & MODIFIER_SHIFT) {
+               access_action ("Transport/ToggleFollowEdits");
+       } else {
+               access_action ("Editor/select-all-tracks");
+       }
        return none;
 }
 
@@ -779,7 +784,11 @@ MackieControlProtocol::touch_release (Button &)
 LedState
 MackieControlProtocol::cancel_press (Button &)
 {
-       access_action ("Transport/ToggleExternalSync");
+       if (main_modifier_state() & MODIFIER_SHIFT) {
+               access_action ("Transport/ToggleExternalSync");
+       } else {
+               access_action ("Editor/escape");
+       }
        return none;
 }
 LedState
@@ -1057,7 +1066,11 @@ MackieControlProtocol::nudge_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::replace_press (Mackie::Button&)
 {
-       access_action ("Editor/finish-range-from-playhead");
+       if (main_modifier_state() == MODIFIER_SHIFT) {
+               toggle_punch_out();
+       } else {
+               access_action ("Editor/finish-range-from-playhead");
+       }
        return off;
 }
 Mackie::LedState
@@ -1068,7 +1081,17 @@ MackieControlProtocol::replace_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::click_press (Mackie::Button&)
 {
-       return none;
+       if (main_modifier_state() & MODIFIER_SHIFT) {
+               access_action ("Editor/set-punch-from-edit-range");
+               return off;
+       } else if (main_modifier_state() & MODIFIER_OPTION) {
+               access_action ("Editor/set-session-from-edit-range");
+               return off;
+       } else {
+               bool state = !Config->get_clicking();
+               Config->set_clicking (state);
+               return state;
+       }
 }
 Mackie::LedState
 MackieControlProtocol::click_release (Mackie::Button&)