From 1f58f81aa6e1f917b00ae1773650dc93b97c6da1 Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Sun, 23 Nov 2014 19:01:46 +0000 Subject: Fix order of parameters to stop_touch() in Mackie::Control Reverse the parameters of Mackie::Control::stop_touch() to make them consistent with AutomationControl::stop_touch(), and fix up the call to AutomationControl::stop_touch() to have the parameters in the correct order. Unfortunately, I don't possess any devices that speak the Mackie protocol, so though the patch seems logical and correct to me, I have no way of testing it. If anyone has a device with touch faders that speaks Mackie, I'd be glad of any confirmation that it at least doesn't break anything. --- libs/surfaces/mackie/controls.cc | 2 +- libs/surfaces/mackie/controls.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/surfaces/mackie') diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc index 1ebc877ef9..9858f5fd16 100644 --- a/libs/surfaces/mackie/controls.cc +++ b/libs/surfaces/mackie/controls.cc @@ -115,7 +115,7 @@ Control::start_touch (double when) } void -Control::stop_touch (double when, bool mark) +Control::stop_touch (bool mark, double when) { if (normal_ac) { return normal_ac->stop_touch (mark, when); diff --git a/libs/surfaces/mackie/controls.h b/libs/surfaces/mackie/controls.h index 38dad7ef7f..0923c9772f 100644 --- a/libs/surfaces/mackie/controls.h +++ b/libs/surfaces/mackie/controls.h @@ -73,7 +73,7 @@ public: void set_value (float val); virtual void start_touch (double when); - virtual void stop_touch (double when, bool mark); + virtual void stop_touch (bool mark, double when); protected: boost::shared_ptr normal_ac; -- cgit v1.2.3