fix merge conflict with master

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

diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 8b39d12727e61cb2efeee40ac848c18444dc58f4..a9d2c5dacd2574555ecffba56052303b5083f3ec 100644 (file)
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -25,7 +25,6 @@
 #include "pbd/stateful.h"
 
 #include "ardour/ardour.h"
-#include "ardour/audioengine.h"
 #include "ardour/delivery.h"
 
 namespace ARDOUR {
@@ -33,11 +32,10 @@ namespace ARDOUR {
 class PeakMeter;
 class Amp;
 
-class Send : public Delivery
+class LIBARDOUR_API 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, bool ignore_bitslot = false);
        virtual ~Send ();
 
        uint32_t bit_slot() const { return _bitslot; }
@@ -50,15 +48,15 @@ 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, bool);
+       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 can_support_io_configuration (const ChanCount& in, ChanCount& out);
        bool configure_io (ChanCount in, ChanCount out);
 
        void activate ();
@@ -66,8 +64,10 @@ class Send : public Delivery
 
        bool set_name (const std::string& str);
 
+       std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+       
        static uint32_t how_many_sends();
-       static void make_unique (XMLNode &, Session &);
+       static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&, bool);
 
   protected:
        bool _metering;
@@ -77,6 +77,9 @@ class Send : public Delivery
   private:
        /* disallow copy construction */
        Send (const Send&);
+       void panshell_changed ();
+
+       int set_state_2X (XMLNode const &, int);
 
        uint32_t  _bitslot;
 };