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 025d56d25ac717a1aea3227d53ef742ff2a28a88..dcbaa5c34bc94b00613d024ca28009fb82aa6836 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -32,7 +32,7 @@
 #include "surface.h"
 #include "fader.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 /* handlers for all buttons, broken into a separate file to avoid clutter in
  * mackie_control_protocol.cc
@@ -102,7 +102,7 @@ MackieControlProtocol::left_press (Button &)
                return none;
        }
 
-       Sorted sorted = get_sorted_routes();
+       Sorted sorted = get_sorted_stripables();
        uint32_t strip_cnt = n_strips ();
 
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("bank left with current initial = %1 nstrips = %2 tracks/busses = %3\n",
@@ -130,7 +130,7 @@ MackieControlProtocol::right_press (Button &)
                return none;
        }
 
-       Sorted sorted = get_sorted_routes();
+       Sorted sorted = get_sorted_stripables();
        uint32_t strip_cnt = n_strips();
        uint32_t route_cnt = sorted.size();
        uint32_t max_bank = route_cnt / strip_cnt * strip_cnt;
@@ -270,7 +270,7 @@ MackieControlProtocol::channel_left_press (Button &)
        if (_subview_mode != None) {
                return none;
        }
-       Sorted sorted = get_sorted_routes();
+       Sorted sorted = get_sorted_stripables();
        if (sorted.size() > n_strips()) {
                prev_track();
                return on;
@@ -291,7 +291,7 @@ MackieControlProtocol::channel_right_press (Button &)
        if (_subview_mode != None) {
                return none;
        }
-       Sorted sorted = get_sorted_routes();
+       Sorted sorted = get_sorted_stripables();
        if (sorted.size() > n_strips()) {
                next_track();
                return on;
@@ -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,8 +424,10 @@ 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 ("Editor/remove-location-from-playhead");
+               access_action ("Common/remove-location-from-playhead");
                return off;
        } else {
                _modifier_state |= MODIFIER_MARKER;
@@ -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)
@@ -525,7 +529,7 @@ MackieControlProtocol::rewind_press (Button &)
        if (modifier_state() & MODIFIER_MARKER) {
                prev_marker ();
        } else if (modifier_state() & MODIFIER_NUDGE) {
-               access_action ("Editor/nudge-playhead-backward");
+               access_action ("Common/nudge-playhead-backward");
        } else if (main_modifier_state() & MODIFIER_SHIFT) {
                goto_start ();
        } else {
@@ -546,7 +550,7 @@ MackieControlProtocol::ffwd_press (Button &)
        if (modifier_state() & MODIFIER_MARKER) {
                next_marker ();
        } else if (modifier_state() & MODIFIER_NUDGE) {
-               access_action ("Editor/nudge-playhead-forward");
+               access_action ("Common/nudge-playhead-forward");
        } else if (main_modifier_state() & MODIFIER_SHIFT) {
                goto_end();
        } else {
@@ -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;
        }
 }
@@ -703,7 +707,7 @@ LedState
 MackieControlProtocol::pan_press (Button &)
 {
        /* XXX eventually pan may have its own subview mode */
-       set_subview_mode (MackieControlProtocol::None, boost::shared_ptr<Route>());
+       set_subview_mode (MackieControlProtocol::None, boost::shared_ptr<Stripable>());
        return none;
 }
 LedState
@@ -726,7 +730,7 @@ MackieControlProtocol::plugin_release (Button &)
 LedState
 MackieControlProtocol::eq_press (Button &)
 {
-       set_subview_mode (EQ, first_selected_route ());
+       set_subview_mode (EQ, first_selected_stripable ());
        return none; /* led state handled by set_subview_mode() */
 
 }
@@ -738,7 +742,7 @@ MackieControlProtocol::eq_release (Button &)
 LedState
 MackieControlProtocol::dyn_press (Button &)
 {
-       set_subview_mode (Dynamics, first_selected_route ());
+       set_subview_mode (Dynamics, first_selected_stripable ());
        return none; /* led state handled by set_subview_mode() */
 }
 
@@ -794,7 +798,7 @@ MackieControlProtocol::cancel_press (Button &)
        if (main_modifier_state() & MODIFIER_SHIFT) {
                access_action ("Transport/ToggleExternalSync");
        } else {
-               access_action ("Editor/escape");
+               access_action ("Main/Escape");
        }
        return none;
 }
@@ -883,13 +887,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");
+               access_action ("Common/set-session-from-edit-range");
                return none;
        }
 
-       if (session) {
-               session->clear_all_solo_state (session->get_routes()); 
-       }
+       cancel_all_solo ();
        return none;
 }
 
@@ -903,7 +905,7 @@ MackieControlProtocol::clearsolo_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::track_press (Mackie::Button&)
 {
-       set_subview_mode (TrackView, first_selected_route());
+       set_subview_mode (TrackView, first_selected_stripable());
        return none;
 }
 Mackie::LedState
@@ -914,7 +916,7 @@ MackieControlProtocol::track_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::send_press (Mackie::Button&)
 {
-       set_subview_mode (Sends, first_selected_route());
+       set_subview_mode (Sends, first_selected_stripable());
        return none; /* led state handled by set_subview_mode() */
 }
 Mackie::LedState
@@ -936,6 +938,9 @@ MackieControlProtocol::miditracks_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::inputs_press (Mackie::Button&)
 {
+#ifdef MIXBUS
+       set_view_mode (Mixer);  //in Mixbus, this is the same as Global View (avoid dead buttons)
+#endif
        return none;
 }
 Mackie::LedState
@@ -957,6 +962,9 @@ MackieControlProtocol::audiotracks_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::audioinstruments_press (Mackie::Button& b)
 {
+#ifdef MIXBUS
+       set_view_mode (MidiTracks);  //in Mixbus, we do the same thing as MIDI Tracks ( aviod dead buttons )
+#endif
        return none;
 }
 
@@ -1075,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;
 }
@@ -1088,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();