From de189721e8964c4efda9df99443ac3dd7da62fdf Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 31 Jan 2017 17:37:23 +0100 Subject: Revert "mackie: improve previous commit - use button_id not button.bid() to make remapping work" This reverts commit 16804e20c8d13b0b217410a208b9416845f48213. --- libs/surfaces/mackie/mackie_control_protocol.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libs/surfaces/mackie/mackie_control_protocol.cc') diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index c3a6135211..d8ed6debef 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -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))); -- cgit v1.2.3