mackie: more debug tracing for remapped buttons

[ardour.git] / libs / surfaces / mackie / mcp_buttons.cc

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index b4f6620bd25b4bfe775ead04370f2d167782327e..dcbaa5c34bc94b00613d024ca28009fb82aa6836 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -364,7 +364,7 @@ MackieControlProtocol::drop_press (Button &)
                toggle_punch_in();
                return none;
        } else {
-               access_action ("Editor/start-range-from-playhead");
+               access_action ("Common/start-range-from-playhead");
        }
        return none;
 }
@@ -424,6 +424,8 @@ MackieControlProtocol::timecode_beats_release (Button &)
 LedState
 MackieControlProtocol::marker_press (Button &)
 {
+       DEBUG_TRACE (DEBUG::MackieControl, "marker press\n");
+
        if (main_modifier_state() & MODIFIER_SHIFT) {
                access_action ("Common/remove-location-from-playhead");
                return off;
@@ -437,6 +439,8 @@ MackieControlProtocol::marker_press (Button &)
 LedState
 MackieControlProtocol::marker_release (Button &)
 {
+       DEBUG_TRACE (DEBUG::MackieControl, "marker release\n");
+
        _modifier_state &= ~MODIFIER_MARKER;
 
        if (main_modifier_state() & MODIFIER_SHIFT)
@@ -565,11 +569,11 @@ LedState
 MackieControlProtocol::loop_press (Button &)
 {
        if (main_modifier_state() & MODIFIER_SHIFT) {
-               access_action ("Editor/set-loop-from-edit-range");
+               access_action ("Common/set-loop-from-edit-range");
                return off;
        } else {
                bool was_on = session->get_play_loop();
-               session->request_play_loop (!was_on);
+               loop_toggle ();
                return was_on ? off : on;
        }
 }
@@ -883,7 +887,7 @@ 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");
+               access_action ("Common/set-session-from-edit-range");
                return none;
        }
 
@@ -1079,7 +1083,7 @@ MackieControlProtocol::replace_press (Mackie::Button&)
                toggle_punch_out();
                return none;
        } else {
-               access_action ("Editor/finish-range-from-playhead");
+               access_action ("Common/finish-range-from-playhead");
        }
        return none;
 }
@@ -1092,7 +1096,7 @@ Mackie::LedState
 MackieControlProtocol::click_press (Mackie::Button&)
 {
        if (main_modifier_state() & MODIFIER_SHIFT) {
-               access_action ("Editor/set-punch-from-edit-range");
+               access_action ("Common/set-punch-from-edit-range");
                return off;
        } else {
                bool state = !Config->get_clicking();