Mackie protocol: set-session-from-edit-range moved to shift+marker

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 6bdbbe2b71ba4dc0741a7421c7de6336180e4de7..8eeb758ef365367b0a7df45345b531a08a0d6c3b 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -423,9 +423,14 @@ MackieControlProtocol::timecode_beats_release (Button &)
 LedState
 MackieControlProtocol::marker_press (Button &)
 {
-       _modifier_state |= MODIFIER_MARKER;
-       marker_modifier_consumed_by_button = false;
-       return on;
+       if (main_modifier_state() & MODIFIER_SHIFT) {
+               access_action ("Editor/set-session-from-edit-range");
+               return off;
+       } else {
+               _modifier_state |= MODIFIER_MARKER;
+               marker_modifier_consumed_by_button = false;
+               return on;
+       }
 }
 
 LedState
@@ -1084,9 +1089,6 @@ MackieControlProtocol::click_press (Mackie::Button&)
        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);