smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Revert "mackie: make profile-mapped keys maybe actually do something"

Browse source 
This reverts commit 0d7f88afbd.
This commit is contained in:
Paul Davis 2017-01-31 17:37:45 +01:00
parent de189721e8
commit 8f13d33efe
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -1533,7 +1533,6 @@ void
MackieControlProtocol::handle_button_event (Surface& surface, Button& button, ButtonState bs) MackieControlProtocol::handle_button_event (Surface& surface, Button& button, ButtonState bs)
{ {
Button::ID button_id = button.bid(); Button::ID button_id = button.bid();
bool remapped_once = false;
if (bs != press && bs != release) { if (bs != press && bs != release) {
update_led (surface, button, none); update_led (surface, button, none);
@ -1553,7 +1552,6 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu
/* check profile first */ /* check profile first */
retry:
string action = _device_profile.get_button_action (button.bid(), _modifier_state); 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)); 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; 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))); 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;
}
} }
} }