ardour/livetrax
13
0
Fork 0
Code

mackie: more debug tracing for remapped buttons

Browse Source
This commit is contained in:
Paul Davis 2017-01-31 17:43:33 +01:00
parent 8f13d33efe
commit 9dc2ef28be
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -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)));

4
libs/surfaces/mackie/mcp_buttons.cc
View File

@ -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)