- Fix process callbakc handling during export

[ardour.git] / libs / ardour / ardour / slave.h

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 62a52155c482e6cc81f327c0172786fd29054592..1cc73474d78a6393169894d75856fbdfea981a76 100644 (file)
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -23,15 +23,17 @@
 #include <vector>
 
 #include <glibmm/thread.h>
+#include <boost/signals2.hpp>
 
 #include <jack/jack.h>
 
-#include <sigc++/signal.h>
+#include "pbd/signals.h"
+
 #include "ardour/types.h"
 #include "midi++/parser.h"
 #include "midi++/types.h"
 
-class PIController;
+class PIChaser;
 
 namespace MIDI {
        class Port;
@@ -171,6 +173,7 @@ class Slave {
 /// We need this wrapper for testability, it's just too hard to mock up a session class
 class ISlaveSessionProxy {
   public:
+       virtual ~ISlaveSessionProxy() {}
        virtual TempoMap& tempo_map()                 const   { return *((TempoMap *) 0); }
        virtual nframes_t   frame_rate()                const   { return 0; }
        virtual nframes64_t audible_frame ()            const   { return 0; }
@@ -219,7 +222,7 @@ struct SafeTime {
     }
 };
 
-class MTC_Slave : public Slave, public sigc::trackable {
+class MTC_Slave : public Slave {
   public:
        MTC_Slave (Session&, MIDI::Port&);
        ~MTC_Slave ();
@@ -239,9 +242,9 @@ class MTC_Slave : public Slave, public sigc::trackable {
   private:
        Session&    session;
        MIDI::Port* port;
-       std::vector<sigc::connection> connections;
+       PBD::ScopedConnectionList port_connections;
        bool        can_notify_on_unknown_rate;
-       PIController* pic;
+       PIChaser* pic;
 
        static const int frame_tolerance;
 
@@ -276,7 +279,7 @@ class MTC_Slave : public Slave, public sigc::trackable {
        void process_apparent_speed (double);
 };
 
-class MIDIClock_Slave : public Slave, public sigc::trackable {
+class MIDIClock_Slave : public Slave {
   public:
        MIDIClock_Slave (Session&, MIDI::Port&, int ppqn = 24);
 
@@ -300,7 +303,7 @@ class MIDIClock_Slave : public Slave, public sigc::trackable {
   private:
        ISlaveSessionProxy* session;
        MIDI::Port* port;
-       std::vector<sigc::connection> connections;
+       PBD::ScopedConnectionList port_connections;
 
        /// pulses per quarter note for one MIDI clock frame (default 24)
        int         ppqn;