Remove no-longer used file.

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

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index b01722e306216b9ae8ba07fb8e2a71177ade7f10..d2b0e49c455bd6274dbd0446589e30b5f4c93ff8 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;
@@ -65,7 +67,7 @@ class Slave {
         *  and after the method call they should
         *
         * Session::follow_slave will then try to follow the given
-        * <emph>position</emph> using a delay locked loop (DLL),
+        * <em>position</em> using a delay locked loop (DLL),
         * starting with the first given transport speed.
         * If the values of speed and position contradict each other,
         * ARDOUR will always follow the position and disregard the speed.
@@ -151,7 +153,7 @@ class Slave {
 
        /**
         * @return the number of frames that this slave wants to seek ahead. Relevant
-        * only if @func requires_seekahead() returns true.
+        * only if requires_seekahead() returns true.
         */
 
        virtual nframes64_t seekahead_distance() const { return 0; }
@@ -220,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 ();
@@ -240,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;
 
@@ -262,10 +264,11 @@ class MTC_Slave : public Slave, public sigc::trackable {
        bool           have_first_speed_accumulator;
        double         average_speed;
        Glib::Mutex    reset_lock;
-       bool           reset_pending;
+       uint32_t       reset_pending;
+       bool           reset_position;
 
-       void reset ();
-       void queue_reset ();
+       void reset (bool with_pos);
+       void queue_reset (bool with_pos);
        void maybe_reset ();
 
        void update_mtc_qtr (MIDI::Parser&, int, nframes_t);
@@ -277,12 +280,12 @@ 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);
 
        /// Constructor for unit tests
-       MIDIClock_Slave (ISlaveSessionProxy* session_proxy, int ppqn = 24);
+       MIDIClock_Slave (ISlaveSessionProxy* session_proxy = 0, int ppqn = 24);
        ~MIDIClock_Slave ();
 
        void rebind (MIDI::Port&);
@@ -298,10 +301,10 @@ class MIDIClock_Slave : public Slave, public sigc::trackable {
 
        void set_bandwidth (double a_bandwith) { bandwidth = a_bandwith; }
 
-  private:
+  protected:
        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;