Mackie: shift+marker needs to remove marker. moved session-range to shift+solo.

Originally cbbd87f50b in mixbus/master

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 40d2c63f693c9d317163444f5a2ae2d931523ee7..5678bdfe12d11a3e11bd56ac23f89eb434ceae3f 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -425,7 +425,7 @@ LedState
 MackieControlProtocol::marker_press (Button &)
 {
        if (main_modifier_state() & MODIFIER_SHIFT) {
-               access_action ("Editor/set-session-from-edit-range");
+               access_action ("Editor/remove-location-from-playhead");
                return off;
        } else {
                _modifier_state |= MODIFIER_MARKER;
@@ -884,6 +884,11 @@ MackieControlProtocol::clearsolo_press (Mackie::Button&)
 {
        // clears all solos and listens (pfl/afl)
 
+       if (main_modifier_state() & MODIFIER_SHIFT) {
+               access_action ("Editor/set-session-from-edit-range");
+               return none;
+       }
+       
        if (session) {
                if (session->soloing()) {
                        session->set_solo (session->get_routes(), false);