ardour/livetrax
13
0
Fork 0
Code

Mackie protocol: set-session-from-edit-range moved to shift+marker

Browse Source
This commit is contained in:
Ben Loftis 2016-02-04 09:30:37 -06:00
parent 9eacddc7a6
commit 23b1944bea
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,9 +423,14 @@ MackieControlProtocol::timecode_beats_release (Button &)
LedState
MackieControlProtocol::marker_press (Button &)
{
_modifier_state |= MODIFIER_MARKER;
marker_modifier_consumed_by_button = false;
return on;
if (main_modifier_state() & MODIFIER_SHIFT) {
access_action ("Editor/set-session-from-edit-range");
return off;
} else {
_modifier_state |= MODIFIER_MARKER;
marker_modifier_consumed_by_button = false;
return on;
}
}
LedState
@ -1084,9 +1089,6 @@ MackieControlProtocol::click_press (Mackie::Button&)
if (main_modifier_state() & MODIFIER_SHIFT) {
access_action ("Editor/set-punch-from-edit-range");
return off;
} else if (main_modifier_state() & MODIFIER_OPTION) {
access_action ("Editor/set-session-from-edit-range");
return off;
} else {
bool state = !Config->get_clicking();
Config->set_clicking (state);