fix clicking when processors become active/inactive; reduce crazy 2.5sec delay for...

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 718e34f29eb972fc1b1c97173680468fa58ced34..7c2c3842761aa83ed4eaa703448cd2539cbbf20c 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -33,8 +33,8 @@
 using namespace PBD;
 using namespace ARDOUR;
 
-InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, boost::shared_ptr<Route> sendto)
-       : Send (s, mm, true)
+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) {
@@ -42,12 +42,12 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, boost:
        }
 
        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, true)
+       : Send (s, mm, node, Delivery::Aux /* will be reset in set_state() */)
 {
        set_state (node);
 }
@@ -72,7 +72,7 @@ InternalSend::send_to_going_away ()
 void
 InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
 {
-       if (!_active || !target || !_send_to) {
+       if ((!_active && !_pending_active) || !target || !_send_to) {
                _meter->reset ();
                return;
        }
@@ -83,7 +83,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
        BufferSet& sendbufs = _session.get_mix_buffers (bufs.count());
        sendbufs.read_from (bufs, nframes);
        assert(sendbufs.count() == bufs.count());
-       
+
        /* gain control */
 
        gain_t tgain = target_gain ();
@@ -102,11 +102,11 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 
                _meter->reset ();
                Amp::apply_simple_gain (sendbufs, nframes, 0.0);
-               return;
+               goto out;
 
        } else if (tgain != 1.0) {
 
-               /* target gain has not changed, but is not unity */
+               /* target gain has not changed, but is not zero or unity */
                Amp::apply_simple_gain (sendbufs, nframes, tgain);
        }
 
@@ -130,6 +130,9 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
        /* deliver to target */
 
        target->merge_from (sendbufs, nframes);
+
+  out:
+       _active = _pending_active;
 }
 
 bool
@@ -223,8 +226,22 @@ InternalSend::set_name (const std::string& str)
        return IOProcessor::set_name (str);
 }
 
+std::string
+InternalSend::display_name () const
+{
+       if (_role == Aux) {
+               return string_compose (X_("aux-%1"), _name);
+       } else {
+               return _name;
+       }
+}
+
 bool
 InternalSend::visible () const
 {
+       if (_role == Aux) {
+               return true;
+       }
+
        return false; 
 }