reset IP MIDI port when deleting a mackie surface port

[ardour.git] / libs / surfaces / mackie / controls.cc

diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc
index e5b8a28ab76ad78252f6f30de22c45331ef2722d..1c88c2b74cfa1a285b8333cbcda5825d399dd5e8 100644 (file)
--- 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)
 {
@@ -115,10 +103,24 @@ 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 (when, mark);
+               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;
+}
+