changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)

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

diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h
index 73dacf7d6887481dfc5fd167f603b98186b26a24..2f39d8688ecb26dfe3549c87c84fbffa8a715a67 100644 (file)
--- a/libs/ardour/ardour/port_insert.h
+++ b/libs/ardour/ardour/port_insert.h
@@ -24,12 +24,12 @@
 #include <string>
 #include <exception>
 
-#include <sigc++/signal.h>
 #include "ardour/ardour.h"
 #include "ardour/io_processor.h"
 #include "ardour/types.h"
 
 class XMLNode;
+class MTDM;
 
 namespace ARDOUR {
 
@@ -44,14 +44,14 @@ class PortInsert : public IOProcessor
 {
   public:
        PortInsert (Session&, boost::shared_ptr<MuteMaster> mm);
-       PortInsert (Session&, boost::shared_ptr<MuteMaster> mm, const XMLNode&, int version = 3000);
+       PortInsert (Session&, boost::shared_ptr<MuteMaster> mm, const XMLNode&);
        ~PortInsert ();
 
        XMLNode& state(bool full);
        XMLNode& get_state(void);
-       int set_state (const XMLNode&, int version = 3000);
+       int set_state (const XMLNode&, int version);
 
-       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
 
        nframes_t signal_latency() const;
 
@@ -60,8 +60,17 @@ class PortInsert : public IOProcessor
        bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
        bool configure_io (ChanCount in, ChanCount out);
 
+       void activate ();
+       void deactivate ();
+
        uint32_t bit_slot() const { return bitslot; }
 
+        void start_latency_detection ();
+        void stop_latency_detection ();
+
+        MTDM* mtdm () const { return _mtdm; }
+        void set_measured_latency (nframes_t);
+
   private:
        /* disallow copy construction */
        PortInsert (const PortInsert&);
@@ -69,7 +78,10 @@ class PortInsert : public IOProcessor
        boost::shared_ptr<Delivery> _out;
 
        uint32_t bitslot;
-};
+        MTDM*     _mtdm;
+        bool      _latency_detect;
+        nframes_t _latency_flush_frames;
+        nframes_t _measured_latency;};
 
 } // namespace ARDOUR