fix construction of new xfades from legacy xfades, and add a few comments here and...

[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 2f39d8688ecb26dfe3549c87c84fbffa8a715a67..657c2c0de6f5dedbd69526e7517db4d20b472d92 100644 (file)
--- a/libs/ardour/ardour/port_insert.h
+++ b/libs/ardour/ardour/port_insert.h
@@ -37,23 +37,23 @@ class Session;
 class IO;
 class Delivery;
 class MuteMaster;
+class Pannable;
 
 /** Port inserts: send output to a Jack port, pick up input at a Jack port
  */
 class PortInsert : public IOProcessor
 {
   public:
-       PortInsert (Session&, boost::shared_ptr<MuteMaster> mm);
-       PortInsert (Session&, boost::shared_ptr<MuteMaster> mm, const XMLNode&);
+       PortInsert (Session&, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster> mm);
        ~PortInsert ();
 
        XMLNode& state(bool full);
        XMLNode& get_state(void);
        int set_state (const XMLNode&, int version);
 
-       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
+       void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
 
-       nframes_t signal_latency() const;
+       framecnt_t signal_latency () const;
 
        bool set_name (const std::string& name);
 
@@ -63,13 +63,16 @@ class PortInsert : public IOProcessor
        void activate ();
        void deactivate ();
 
-       uint32_t bit_slot() const { return bitslot; }
+       uint32_t bit_slot() const { return _bitslot; }
 
-        void start_latency_detection ();
-        void stop_latency_detection ();
+       void start_latency_detection ();
+       void stop_latency_detection ();
 
-        MTDM* mtdm () const { return _mtdm; }
-        void set_measured_latency (nframes_t);
+       MTDM* mtdm () const { return _mtdm; }
+       void set_measured_latency (framecnt_t);
+       framecnt_t latency () const;
+
+       static std::string name_and_id_new_insert (Session&, uint32_t&);
 
   private:
        /* disallow copy construction */
@@ -77,11 +80,12 @@ 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;};
+       uint32_t   _bitslot;
+       MTDM*      _mtdm;
+       bool       _latency_detect;
+       framecnt_t _latency_flush_frames;
+       framecnt_t _measured_latency;
+};
 
 } // namespace ARDOUR