partially revert some of the recent work on tempo to reflect new understanding of...

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

diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index b86d321bd21c0be55a562ecd095b78deb90bca75..6afc131e706baffca59ac238bb29b66ac66e556c 100644 (file)
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -20,13 +20,11 @@
 #ifndef __ardour_send_h__
 #define __ardour_send_h__
 
-#include <sigc++/signal.h>
 #include <string>
 
 #include "pbd/stateful.h"
 
 #include "ardour/ardour.h"
-#include "ardour/audioengine.h"
 #include "ardour/delivery.h"
 
 namespace ARDOUR {
@@ -37,8 +35,7 @@ class Amp;
 class Send : public Delivery
 {
   public:
-       Send (Session&, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send);
-       Send (Session&, boost::shared_ptr<MuteMaster>, const XMLNode&, int version = 3000, Delivery::Role r = Delivery::Send);
+       Send (Session&, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send);
        virtual ~Send ();
 
        uint32_t bit_slot() const { return _bitslot; }
@@ -51,13 +48,13 @@ class Send : public Delivery
        bool metering() const { return _metering; }
        void set_metering (bool yn) { _metering = yn; }
 
-       XMLNode& state(bool full);
-       XMLNode& get_state(void);
+       XMLNode& state (bool full);
+       XMLNode& get_state ();
        int set_state(const XMLNode&, int version);
 
        uint32_t pans_required() const { return _configured_input.n_audio(); }
 
-       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+       void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
 
        bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
        bool configure_io (ChanCount in, ChanCount out);
@@ -79,6 +76,8 @@ class Send : public Delivery
        /* disallow copy construction */
        Send (const Send&);
 
+       int set_state_2X (XMLNode const &, int);
+
        uint32_t  _bitslot;
 };