ardour/livetrax
13
0
Fork 0
Code

remove shift-fader-touch as a way to reset gain to default

Browse Source
This commit is contained in:
Paul Davis 2016-01-18 11:58:49 -05:00
parent 746d5c6624
commit c2bf0fc94e
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/surfaces/mackie/strip.cc
View File

@ -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 {

8
libs/surfaces/mackie/surface.cc
View File

@ -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) {