fully implement and deploy explicit x-thread signal connection syntax (testing comes...

[ardour.git] / libs / surfaces / mackie / mackie_port.h

diff --git a/libs/surfaces/mackie/mackie_port.h b/libs/surfaces/mackie/mackie_port.h
index 26ec1ca799cc6e4d5701d4fc5484cf35bfdb26a6..292fc2ac13866862c557468d1baede77e1ee3103 100644 (file)
--- a/libs/surfaces/mackie/mackie_port.h
+++ b/libs/surfaces/mackie/mackie_port.h
@@ -18,14 +18,12 @@
 #ifndef mackie_port_h
 #define mackie_port_h
 
-#include "surface_port.h"
-
 #include <midi++/types.h>
-#include <sigc++/signal.h>
-#include <sigc++/connection.h>
-
 #include <glibmm/thread.h>
 
+#include "pbd/signals.h"
+
+#include "surface_port.h"
 #include "midi_byte_array.h"
 #include "types.h"
 
@@ -116,8 +114,8 @@ protected:
 private:
        MackieControlProtocol & _mcp;
        port_type_t _port_type;
-       sigc::connection _any;
-       sigc::connection _sysex;
+       PBD::ScopedConnection any_connection;
+       PBD::ScopedConnection sysex_connection;
        emulation_t _emulation;
 
        bool _initialising;