From 8f13d33efe157465b44b1f3d17e421aa223af62d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 31 Jan 2017 17:37:45 +0100 Subject: [PATCH] Revert "mackie: make profile-mapped keys maybe actually do something" This reverts commit 0d7f88afbdb4477990706faa49a75e4dfb419b75. --- libs/surfaces/mackie/mackie_control_protocol.cc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index d8ed6debef..7a699ca90a 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1533,7 +1533,6 @@ void MackieControlProtocol::handle_button_event (Surface& surface, Button& button, ButtonState bs) { Button::ID button_id = button.bid(); - bool remapped_once = false; if (bs != press && bs != release) { update_led (surface, button, none); @@ -1553,7 +1552,6 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu /* check profile first */ - retry: string action = _device_profile.get_button_action (button.bid(), _modifier_state); DEBUG_TRACE (DEBUG::MackieControl, string_compose ("device profile returned [%1] for that button\n", action)); @@ -1595,16 +1593,6 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu button_id = (Button::ID) bid; DEBUG_TRACE (DEBUG::MackieControl, string_compose ("handling button %1 as if it was %2 (%3)\n", Button::id_to_name (button.bid()), button_id, Button::id_to_name (button_id))); - - if (!remapped_once) { - remapped_once = true; - DEBUG_TRACE (DEBUG::MackieControl, "looping back to retry key/action lookup\n"); - goto retry; - } else { - warning << string_compose ("Mackie Control: remapping of keys/buttons is not supported (seen for %1); no action will be invoked.", - Button::id_to_name (button.bid())) << endmsg; - } - } }