ardour/livetrax
13
0
Fork 0
Code

Revert "mackie: improve previous commit - use button_id not button.bid() to make remapping work"

Browse Source 
This reverts commit 16804e20c8.
This commit is contained in:
Paul Davis 2017-01-31 17:37:23 +01:00
parent 16804e20c8
commit de189721e8
1 changed files with 1 additions and 3 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

@ -1554,7 +1554,7 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu
/* check profile first */
retry:
string action = _device_profile.get_button_action (button_id, _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));
@ -1593,8 +1593,6 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu
return;
}
/* reset button_id to the result of the lookup */
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)));