From c2bf0fc94e708c3733472efa829953d277f490f5 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 18 Jan 2016 11:58:49 -0500
Subject: [PATCH] remove shift-fader-touch as a way to reset gain to default

---
 libs/surfaces/mackie/strip.cc   | 15 ++++-----------
 libs/surfaces/mackie/surface.cc |  8 --------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index fcb544a92e..52b9b41f9f 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -828,18 +828,11 @@ Strip::fader_touch_event (Button&, ButtonState bs)
 
 		boost::shared_ptr<AutomationControl> ac = _fader->control ();
 
-		if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
-			if (ac) {
-				ac->set_value (ac->normal(), Controllable::NoGroup);
-			}
-		} else {
+		_fader->set_in_use (true);
+		_fader->start_touch (_surface->mcp().transport_frame());
 
-			_fader->set_in_use (true);
-			_fader->start_touch (_surface->mcp().transport_frame());
-
-			if (ac) {
-				queue_parameter_display ((AutomationType) ac->parameter().type(), ac->get_value());
-			}
+		if (ac) {
+			queue_parameter_display ((AutomationType) ac->parameter().type(), ac->get_value());
 		}
 
 	} else {
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 942fb809a9..c7dd289e01 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -529,14 +529,6 @@ Surface::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb, uin
 		turn_it_on ();
 	}
 
-	if (_mcp.main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
-		/* user is doing a reset to unity gain but device sends a PB
-		 * message in the middle of the touch on/off messages. Ignore
-		 * it.
-		 */
-		return;
-	}
-
 	Fader* fader = faders[fader_id];
 
 	if (fader) {