X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fcontrols.cc;h=bbe1029f30080389740991e4ebe46302cea936ae;hb=0c448c387bf4fc11c1bc2494055303ed12a15208;hp=1ebc877ef9f88d61da5027ca567fdff7fb0c533b;hpb=ea5876b8364beb3b1b2fb82909b00ff107dbb6ca;p=ardour.git

diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc
index 1ebc877ef9..bbe1029f30 100644
--- a/libs/surfaces/mackie/controls.cc
+++ b/libs/surfaces/mackie/controls.cc
@@ -34,8 +34,10 @@
 #include "meter.h"
 
 
-using namespace Mackie;
 using namespace std;
+using namespace ArdourSurface;
+using namespace Mackie;
+
 using ARDOUR::AutomationControl;
 
 void Group::add (Control& control)
@@ -69,20 +71,6 @@ Control::set_in_use (bool in_use)
 	_in_use = in_use;
 }
 
-ostream & Mackie::operator <<  (ostream & os, const Mackie::Control & control)
-{
-	os << typeid (control).name();
-	os << " { ";
-	os << "name: " << control.name();
-	os << ", ";
-	os << "id: " << "0x" << setw(2) << setfill('0') << hex << control.id() << setfill(' ');
-	os << ", ";
-	os << "group: " << control.group().name();
-	os << " }";
-	
-	return os;
-}
-
 void
 Control::set_control (boost::shared_ptr<AutomationControl> ac)
 {
@@ -113,12 +101,26 @@ Control::start_touch (double when)
 		return normal_ac->start_touch (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);
 	}
 }
-	
+
+ostream & operator <<  (ostream & os, const ArdourSurface::Mackie::Control & control)
+{
+	os << typeid (control).name();
+	os << " { ";
+	os << "name: " << control.name();
+	os << ", ";
+	os << "id: " << "0x" << setw(2) << setfill('0') << hex << control.id() << setfill(' ');
+	os << ", ";
+	os << "group: " << control.group().name();
+	os << " }";
+
+	return os;
+}
+