diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-06 15:47:27 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-06 15:47:27 -0500 |
| commit | 09921e1d765f09044effb8f38a95addabfeb3fc2 (patch) | |
| tree | 6f461ec5d7aeb8b2b827688609ea6d9da1a88362 /libs | |
| parent | 97f523d396d3b53140a77fa7c209409df3a2e977 (diff) | |
Mackie: shift+marker needs to remove marker. moved session-range to shift+solo.
Originally cbbd87f50b in mixbus/master
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/mackie/mcp_buttons.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 40d2c63f69..5678bdfe12 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -425,7 +425,7 @@ LedState MackieControlProtocol::marker_press (Button &) { if (main_modifier_state() & MODIFIER_SHIFT) { - access_action ("Editor/set-session-from-edit-range"); + access_action ("Editor/remove-location-from-playhead"); return off; } else { _modifier_state |= MODIFIER_MARKER; @@ -884,6 +884,11 @@ MackieControlProtocol::clearsolo_press (Mackie::Button&) { // clears all solos and listens (pfl/afl) + if (main_modifier_state() & MODIFIER_SHIFT) { + access_action ("Editor/set-session-from-edit-range"); + return none; + } + if (session) { if (session->soloing()) { session->set_solo (session->get_routes(), false); |