allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

MCP: shift-select resets gain to unity; don't jump back to last transport start unless playing normally; footswitch 1 and 2 do play/stop

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11934 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2012-04-12 01:51:57 +00:00
parent 6c9dc8f0b3
commit f991e11b77
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/surfaces/mackie/mcp_buttons.cc
View File

@@ -500,11 +500,11 @@ MackieControlProtocol::stop_release (Button &)
LedState
MackieControlProtocol::play_press (Button &)
{
/* if we're already rolling, and we're pressed
/* if we're already rolling at normal speed, and we're pressed
again, jump back to where we started last time
*/
transport_play (session->transport_rolling());
transport_play (session->transport_rolling() == 1.0);
return none;
}
@@ -530,7 +530,6 @@ MackieControlProtocol::record_release (Button &)
LedState
MackieControlProtocol::rewind_press (Button &)
{
DEBUG_TRACE (DEBUG::MackieControl, "REWIND PRESS\n");
rewind ();
return none;
}
@@ -995,6 +994,7 @@ MackieControlProtocol::mixer_release (Button &)
LedState
MackieControlProtocol::user_a_press (Button &)
{
transport_play (session->transport_speed() == 1.0);
return off;
}
LedState
@@ -1005,6 +1005,7 @@ MackieControlProtocol::user_a_release (Button &)
LedState
MackieControlProtocol::user_b_press (Button &)
{
transport_stop();
return off;
}
LedState

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

@@ -392,6 +392,9 @@ Strip::handle_button (Button& button, ButtonState bs)
if (_route) {
_route_locked = !_route_locked;
}
} else if (_surface->mcp().modifier_state() == MackieControlProtocol::MODIFIER_SHIFT) {
/* reset gain value to unity */
_route->set_gain (1.0, this);
} else {
_surface->mcp().select_track (_route);
}