From 5a55ac582dceeebdee48f66bce954bd86847abd8 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 18 Jan 2016 11:59:06 -0500
Subject: [PATCH] mackie: shift-fader overrides group settings

---
 libs/surfaces/mackie/strip.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 52b9b41f9f..af938b8990 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -1050,7 +1050,13 @@ Strip::handle_fader (Fader& fader, float position)
 		return;
 	}
 
-	fader.set_value (position);
+	Controllable::GroupControlDisposition gcd = Controllable::UseGroup;
+
+	if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+		gcd = Controllable::NoGroup;
+	}
+
+	fader.set_value (position, gcd);
 
 	/* From the Mackie Control MIDI implementation docs: