diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2016-02-04 09:30:37 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2016-02-04 09:30:37 -0600 |
| commit | 23b1944beac919e80225c50400d9b2ed973ed13c (patch) | |
| tree | 5c348fa5800eb3f27c8b0ef798dbdc873e68c047 /libs/surfaces/mackie/mcp_buttons.cc | |
| parent | 9eacddc7a634d91f33a7a21de07bd29b62ebd691 (diff) | |
Mackie protocol: set-session-from-edit-range moved to shift+marker
Diffstat (limited to 'libs/surfaces/mackie/mcp_buttons.cc')
| -rw-r--r-- | libs/surfaces/mackie/mcp_buttons.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 6bdbbe2b71..8eeb758ef3 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -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); |