merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending...

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

diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h
index ad498b852d96416ff0a1d3e1bfb243a8a0526a0b..53c6686887595cb95b7914bd4983c5caa1389392 100644 (file)
--- a/libs/ardour/ardour/internal_send.h
+++ b/libs/ardour/ardour/internal_send.h
@@ -28,8 +28,7 @@ namespace ARDOUR {
 class InternalSend : public Send
 {
   public:
-       InternalSend (Session&, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to, Delivery::Role role);
-       InternalSend (Session&, boost::shared_ptr<MuteMaster>, const XMLNode&);
+       InternalSend (Session&, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to, Delivery::Role role);
        virtual ~InternalSend ();
 
        std::string display_name() const;
@@ -40,11 +39,11 @@ class InternalSend : public Send
        XMLNode& get_state(void);
        int set_state(const XMLNode& node, 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);
        bool feeds (boost::shared_ptr<Route> other) const;
        bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
        bool configure_io (ChanCount in, ChanCount out);
-       void set_block_size (nframes_t);
+       int  set_block_size (pframes_t);
 
        boost::shared_ptr<Route> target_route() const { return _send_to; }
        const PBD::ID& target_id() const { return _send_to_id; }
@@ -55,11 +54,13 @@ class InternalSend : public Send
        boost::shared_ptr<Route> _send_to;
        PBD::ID _send_to_id;
        PBD::ScopedConnection connect_c;
+        PBD::ScopedConnectionList target_connections;
 
        void send_to_going_away ();
        void send_to_property_changed (const PBD::PropertyChange&);
        int  connect_when_legal ();
        int  set_our_state (XMLNode const &, int);
+        int  use_target (boost::shared_ptr<Route>);
 };
 
 } // namespace ARDOUR