From 09921e1d765f09044effb8f38a95addabfeb3fc2 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sat, 6 Feb 2016 15:47:27 -0500
Subject: [PATCH] Mackie: shift+marker needs to remove marker.  moved
 session-range to shift+solo.

Originally cbbd87f50b in mixbus/master
---
 libs/surfaces/mackie/mcp_buttons.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 40d2c63f69..5678bdfe12 100644
--- 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);