diff options
author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-11-23 19:01:46 +0000 |
---|---|---|
committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-11-25 14:59:48 +0000 |
commit | 1f58f81aa6e1f917b00ae1773650dc93b97c6da1 (patch) | |
tree | 8e060b75fd868ff33ee1ff61b9a736fdd613181e /libs/surfaces | |
parent | 421a1d9912a78e64bcc1c67d42a209c3fbd8bf9b (diff) |
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.
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/mackie/controls.cc | 2 | ||||
-rw-r--r-- | libs/surfaces/mackie/controls.h | 2 |
2 files changed, 2 insertions, 2 deletions
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<ARDOUR::AutomationControl> normal_ac; |