Don't add standard processors twice to routes from 2.X sessions. Fixes #3434.

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 9cfc8d9702e2097d9d169ccc375511fd486ba691..8ec543030870a76c09a37892572e7ebe0af8519e 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -34,24 +34,13 @@ using namespace std;
 
 InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, boost::shared_ptr<Route> sendto, Delivery::Role role)
        : Send (s, mm, role)
-       , _send_to (sendto)
+       , target (0)
 {
-       if ((target = _send_to->get_return_buffer ()) == 0) {
-               throw failed_constructor();
-       }
-
-       set_name (sendto->name());
-
-       _send_to->DropReferences.connect_same_thread (*this, boost::bind (&InternalSend::send_to_going_away, this));
-       _send_to->PropertyChanged.connect_same_thread (*this, boost::bind (&InternalSend::send_to_property_changed, this, _1));;
-}
-
-InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node)
-       : Send (s, mm, node, Stateful::loading_state_version, Delivery::Aux /* will be reset in set_state() */),
-         target (0)
-{
-       /* Send constructor will set its state, so here we just need to set up our own */
-       set_our_state (node, Stateful::loading_state_version);
+        if (sendto) {
+                if (use_target (sendto)) {
+                        throw failed_constructor();
+                }
+        }
 }
 
 InternalSend::~InternalSend ()
@@ -59,20 +48,40 @@ InternalSend::~InternalSend ()
        if (_send_to) {
                _send_to->release_return_buffer ();
        }
+}
 
-       connect_c.disconnect ();
+int
+InternalSend::use_target (boost::shared_ptr<Route> sendto)
+{
+        _send_to = sendto;
+
+        if ((target = _send_to->get_return_buffer ()) == 0) {
+                return -1;
+        }
+        
+        set_name (sendto->name());
+        _send_to_id = _send_to->id();
+
+        target_connections.drop_connections ();
+
+        _send_to->DropReferences.connect_same_thread (target_connections, boost::bind (&InternalSend::send_to_going_away, this));
+        _send_to->PropertyChanged.connect_same_thread (target_connections, boost::bind (&InternalSend::send_to_property_changed, this, _1));;
+
+        return 0;
 }
 
+
 void
 InternalSend::send_to_going_away ()
 {
        target = 0;
+        target_connections.drop_connections ();
        _send_to.reset ();
        _send_to_id = "0";
 }
 
 void
-InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
+InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes, bool)
 {
        if ((!_active && !_pending_active) || !target || !_send_to) {
                _meter->reset ();
@@ -137,10 +146,16 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
        _active = _pending_active;
 }
 
-void
+int
 InternalSend::set_block_size (nframes_t nframes)
 {
        mixbufs.ensure_buffers (_configured_input, nframes);
+
+       /* ensure that our target can cope with us merging this many frames to it */
+       if (target) {
+               target->ensure_buffers (_configured_input, nframes);
+       }
+        return 0;
 }
 
 bool
@@ -212,17 +227,14 @@ InternalSend::connect_when_legal ()
                return 0;
        }
 
-       if ((_send_to = _session.route_by_id (_send_to_id)) == 0) {
-               error << X_("cannot find route to connect to") << endmsg;
-               return -1;
-       }
+        boost::shared_ptr<Route> sendto;
 
-       if ((target = _send_to->get_return_buffer ()) == 0) {
-               error << X_("target for internal send has no return buffer") << endmsg;
+       if ((sendto = _session.route_by_id (_send_to_id)) == 0) {
+               error << X_("cannot find route to connect to") << endmsg;
                return -1;
        }
 
-       return 0;
+        return use_target (sendto);
 }
 
 bool