diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-18 11:58:49 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-18 12:11:09 -0500 |
| commit | c2bf0fc94e708c3733472efa829953d277f490f5 (patch) | |
| tree | 1c818075fbad3712af1015bb30743857d3d5701d /libs | |
| parent | 746d5c6624727fa92ee1f15a1c5192b9d44b9961 (diff) | |
remove shift-fader-touch as a way to reset gain to default
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 15 | ||||
| -rw-r--r-- | 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) { |