Merge branch 'master' into windows

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

diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index bf5c5d73707cb7b229a0b69e04698204af38be48..1a21d1d05057605a09f646781d930b30ff0d4e70 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 {
@@ -36,7 +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<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send);
        virtual ~Send ();
 
        uint32_t bit_slot() const { return _bitslot; }
@@ -57,7 +56,7 @@ class Send : public Delivery
 
        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 ();
@@ -65,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&);
 
   protected:
        bool _metering;