Make MIDI region `automation' respect the automation mode so that it is

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index f44c0617db7bc68a388a836b7f29ab1b4df34138..36621717404cd62c720fb776f1f3e91706e6448f 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -17,8 +17,6 @@
 
 */
 
-#include <iostream>
-
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
 
@@ -32,25 +30,16 @@
 
 using namespace PBD;
 using namespace ARDOUR;
+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)
-{
-       if ((target = _send_to->get_return_buffer ()) == 0) {
-               throw failed_constructor();
-       }
-
-       set_name (sendto->name());
-
-       _send_to->GoingAway.connect (mem_fun (*this, &InternalSend::send_to_going_away));
-}
-
-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() */)
 {
-       /* 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 ()
@@ -58,20 +47,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)
+InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
 {
        if ((!_active && !_pending_active) || !target || !_send_to) {
                _meter->reset ();
@@ -94,7 +103,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 
                Amp::apply_gain (mixbufs, nframes, _current_gain, tgain);
                _current_gain = tgain;
-
+                
        } else if (tgain == 0.0) {
 
                /* we were quiet last time, and we're still supposed to be quiet.
@@ -114,7 +123,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
        // so that we don't overwrite the main automation data for the route amp
        // _amp->setup_gain_automation (start_frame, end_frame, nframes);
 
-       _amp->run (mixbufs, start_frame, end_frame, nframes);
+       _amp->run (mixbufs, start_frame, end_frame, nframes, true);
 
        /* XXX NEED TO PAN */
 
@@ -124,7 +133,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
                if (_amp->gain_control()->get_value() == 0) {
                        _meter->reset();
                } else {
-                       _meter->run (mixbufs, start_frame, end_frame, nframes);
+                       _meter->run (mixbufs, start_frame, end_frame, nframes, true);
                }
        }
 
@@ -171,7 +180,7 @@ InternalSend::get_state()
 }
 
 int
-InternalSend::set_our_state (const XMLNode& node, int version)
+InternalSend::set_our_state (const XMLNode& node, int /*version*/)
 {
        const XMLProperty* prop;
 
@@ -185,7 +194,7 @@ InternalSend::set_our_state (const XMLNode& node, int version)
                */
 
                if (!IO::connecting_legal) {
-                       connect_c = IO::ConnectingLegal.connect (mem_fun (*this, &InternalSend::connect_when_legal));
+                       IO::ConnectingLegal.connect_same_thread (connect_c, boost::bind (&InternalSend::connect_when_legal, this));
                } else {
                        connect_when_legal ();
                }
@@ -211,17 +220,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
@@ -240,13 +246,13 @@ InternalSend::configure_io (ChanCount in, ChanCount out)
 }
 
 bool
-InternalSend::set_name (const std::string& str)
+InternalSend::set_name (const string& str)
 {
        /* rules for external sends don't apply to us */
        return IOProcessor::set_name (str);
 }
 
-std::string
+string
 InternalSend::display_name () const
 {
        if (_role == Aux) {
@@ -265,3 +271,11 @@ InternalSend::visible () const
 
        return false;
 }
+
+void
+InternalSend::send_to_property_changed (const PropertyChange& what_changed)
+{
+       if (what_changed.contains (Properties::name)) {
+               set_name (_send_to->name ());
+       }
+}