From 9dc2ef28be110eddeb28f644a27d47153d06eac4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 31 Jan 2017 17:43:33 +0100 Subject: [PATCH] mackie: more debug tracing for remapped buttons --- libs/surfaces/mackie/mackie_control_protocol.cc | 4 ++++ libs/surfaces/mackie/mcp_buttons.cc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 7a699ca90a..a2636f070c 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1598,12 +1598,16 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu /* lookup using the device-INDEPENDENT button ID */ + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("now looking up button ID %1", button_id)); + ButtonMap::iterator b = button_map.find (button_id); if (b != button_map.end()) { ButtonHandlers& bh (b->second); + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("button found in map, now invoking %1\n", (bs == press ? "press" : "release"))); + switch (bs) { case press: surface.write (button.set_state ((this->*(bh.press)) (button))); diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 1a45719b79..dcbaa5c34b 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -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)