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.

diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc
index 1ebc877ef9f88d61da5027ca567fdff7fb0c533b..9858f5fd1688a3d29c3a04735b6a438b405ad503 100644 (file)
--- 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 38dad7ef7fa31297fd5d9c54661b30d95601df7c..0923c9772fb973775b829c486c460d57be96e97f 100644 (file)
--- 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;