From c78426968ffbfd630c401f5acedb2b2b47789dbe Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 2 Oct 2015 22:07:24 -0400 Subject: [PATCH] avoid handling pitchbend (fader) messages while SHIFT modifier is active. See comment in code for more detail --- libs/surfaces/mackie/surface.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index 562807ce79..4b5a0ef797 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -403,6 +403,14 @@ 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) {