ardour/livetrax
13
0
Fork 0
Code

Mackie Protocol: fixes for aac6a5

Browse Source
This commit is contained in:
Ben Loftis 2016-02-04 11:17:45 -06:00
parent dbb48bfff9
commit 1b5931a028
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,6 +362,7 @@ MackieControlProtocol::drop_press (Button &)
{ {
if (main_modifier_state() == MODIFIER_SHIFT) { if (main_modifier_state() == MODIFIER_SHIFT) {
toggle_punch_in(); toggle_punch_in();
return session->config.get_punch_in() ? flashing : off;
} else { } else {
access_action ("Editor/start-range-from-playhead"); access_action ("Editor/start-range-from-playhead");
} }
@ -438,6 +439,9 @@ MackieControlProtocol::marker_release (Button &)
{ {
_modifier_state &= ~MODIFIER_MARKER; _modifier_state &= ~MODIFIER_MARKER;
if (main_modifier_state() & MODIFIER_SHIFT)
return off; //if shift was held, we already did the action
if (marker_modifier_consumed_by_button) { if (marker_modifier_consumed_by_button) {
/* marker was used a modifier for some other button(s), so do /* marker was used a modifier for some other button(s), so do
nothing nothing
@ -1073,6 +1077,7 @@ MackieControlProtocol::replace_press (Mackie::Button&)
{ {
if (main_modifier_state() == MODIFIER_SHIFT) { if (main_modifier_state() == MODIFIER_SHIFT) {
toggle_punch_out(); toggle_punch_out();
return session->config.get_punch_out() ? flashing : off;
} else { } else {
access_action ("Editor/finish-range-from-playhead"); access_action ("Editor/finish-range-from-playhead");
} }