Skeleton tests for BBT_Time.

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index f11c6037b31516bdef02935f9c6bcf382caca7f9..d70889a27c922445a5a65ecf83461d12cf183b74 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -42,14 +42,14 @@ 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, Delivery::Aux /* will be reset in set_state() */)
 {
-       set_state (node);
+       set_state (node, Stateful::loading_state_version);
 }
 
 InternalSend::~InternalSend ()
@@ -79,20 +79,19 @@ 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 */
 
        gain_t tgain = target_gain ();
-       
+
        if (tgain != _current_gain) {
-               
+
                /* 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) {
@@ -101,42 +100,48 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
                */
 
                _meter->reset ();
-               Amp::apply_simple_gain (sendbufs, nframes, 0.0);
+               Amp::apply_simple_gain (mixbufs, nframes, 0.0);
                goto out;
 
        } else if (tgain != 1.0) {
 
                /* target gain has not changed, but is not zero or unity */
-               Amp::apply_simple_gain (sendbufs, nframes, tgain);
+               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 */
-       
+
        if (_metering) {
                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
 InternalSend::feeds (boost::shared_ptr<Route> other) const
 {
@@ -155,7 +160,7 @@ InternalSend::state (bool full)
        if (_send_to) {
                node.add_property ("target", _send_to->id().to_s());
        }
-       
+
        return node;
 }
 
@@ -166,11 +171,11 @@ InternalSend::get_state()
 }
 
 int
-InternalSend::set_state (const XMLNode& node)
+InternalSend::set_state (const XMLNode& node, int version)
 {
        const XMLProperty* prop;
 
-       Send::set_state (node);
+       Send::set_state (node, version);
 
        if ((prop = node.property ("target")) != 0) {
 
@@ -187,7 +192,7 @@ InternalSend::set_state (const XMLNode& node)
                        connect_when_legal ();
                }
        }
-       
+
        return 0;
 }
 
@@ -204,8 +209,8 @@ InternalSend::connect_when_legal ()
        if ((_send_to = _session.route_by_id (_send_to_id)) == 0) {
                error << X_("cannot find route to connect to") << endmsg;
                return -1;
-       } 
-       
+       }
+
        if ((target = _send_to->get_return_buffer ()) == 0) {
                error << X_("target for internal send has no return buffer") << endmsg;
                return -1;
@@ -214,13 +219,21 @@ InternalSend::connect_when_legal ()
        return 0;
 }
 
-bool 
+bool
 InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
        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)
 {
@@ -245,5 +258,5 @@ InternalSend::visible () const
                return true;
        }
 
-       return false; 
+       return false;
 }