avoid crashes caused by the process buffer set being larger than expected when passed...

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index db0390e813f8290a96fe891a505c7a1bf2c5acc1..ad56622fc78c9bd0ec8a61d2cac8ec8e6da2ffe9 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -33,19 +33,21 @@
 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) {
                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, true)
+       : Send (s, mm, node, Delivery::Aux /* will be reset in set_state() */)
 {
        set_state (node);
 }
@@ -70,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;
        }
@@ -78,9 +80,8 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
        // we have to copy the input, because we may alter the buffers with the amp
        // in-place, which a send must never do.
        
-       BufferSet& sendbufs = _session.get_mix_buffers (bufs.count());
-       sendbufs.read_from (bufs, nframes);
-       assert(sendbufs.count() == bufs.count());
+       assert(mixbufs.available() >= bufs.count());
+       mixbufs.read_from (bufs, nframes);
        
        /* gain control */
 
@@ -90,7 +91,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
                
                /* target gain has changed */
 
-               Amp::apply_gain (sendbufs, nframes, _current_gain, tgain);
+               Amp::apply_gain (mixbufs, nframes, _current_gain, tgain);
                _current_gain = tgain;
 
        } else if (tgain == 0.0) {
@@ -99,21 +100,23 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
                */
 
                _meter->reset ();
-               Amp::apply_simple_gain (sendbufs, nframes, 0.0);
-               
-               return;
+               Amp::apply_simple_gain (mixbufs, nframes, 0.0);
+               goto out;
 
        } else if (tgain != 1.0) {
 
-               /* target gain has not changed, but is not unity */
-               Amp::apply_simple_gain (sendbufs, nframes, tgain);
+               /* target gain has not changed, but is not zero or unity */
+               Amp::apply_simple_gain (mixbufs, nframes, tgain);
        }
+
        
        // Can't automate gain for sends or returns yet because we need different buffers
        // 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 (sendbufs, start_frame, end_frame, nframes);
+       _amp->run (mixbufs, start_frame, end_frame, nframes);
+
+       /* XXX NEED TO PAN */
 
        /* consider metering */
        
@@ -121,13 +124,22 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
                if (_amp->gain_control()->get_value() == 0) {
                        _meter->reset();
                } else {
-                       _meter->run (sendbufs, start_frame, end_frame, nframes);
+                       _meter->run (mixbufs, start_frame, end_frame, nframes);
                }
        }
 
        /* deliver to target */
 
-       target->merge_from (sendbufs, nframes);
+       target->merge_from (mixbufs, nframes);
+
+  out:
+       _active = _pending_active;
+}
+
+void
+InternalSend::set_block_size (nframes_t nframes)
+{
+       mixbufs.ensure_buffers (_configured_input, nframes);
 }
 
 bool
@@ -213,3 +225,38 @@ InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out)
        out = in;
        return true;
 }
+
+bool
+InternalSend::configure_io (ChanCount in, ChanCount out)
+{
+       bool ret = Send::configure_io (in, out);
+       set_block_size (_session.engine().frames_per_cycle());
+       return ret;
+}
+
+bool
+InternalSend::set_name (const std::string& str)
+{
+       /* rules for external sends don't apply to us */
+       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; 
+}