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 c83eff65ab1f414a5c2a5bb201ae58fc67328a25..1a21d1d05057605a09f646781d930b30ff0d4e70 100644 (file)
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -56,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 ();
@@ -67,7 +67,7 @@ class Send : public Delivery
        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;
@@ -81,7 +81,6 @@ class Send : public Delivery
        int set_state_2X (XMLNode const &, int);
 
        uint32_t  _bitslot;
-       static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&);
 };
 
 } // namespace ARDOUR