Fix crash on out of range MIDI events (though this shouldn't be possible at all....

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

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 1ba063b2dceafa8e4fc6bf6189ec24797d9298bf..736a443c721137e91a9e9237518d1d73f455cb94 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -33,14 +33,14 @@ using namespace ARDOUR;
 using namespace PBD;
 
 Send::Send (Session& s, Placement p)
-       : Redirect (s, string_compose (_("send %1"), (bitslot = s.next_send_id()) + 1), p)
+       : IOProcessor (s, string_compose (_("send %1"), (bitslot = s.next_send_id()) + 1), p)
 {
        _metering = false;
-       InsertCreated (this); /* EMIT SIGNAL */
+       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Send::Send (Session& s, const XMLNode& node)
-       : Redirect (s,  "send", PreFader)
+       : IOProcessor (s,  "send", PreFader)
 {
        _metering = false;
 
@@ -48,14 +48,14 @@ Send::Send (Session& s, const XMLNode& node)
                throw failed_constructor();
        }
 
-       InsertCreated (this); /* EMIT SIGNAL */
+       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Send::Send (const Send& other)
-       : Redirect (other._session, string_compose (_("send %1"), (bitslot = other._session.next_send_id()) + 1), other.placement())
+       : IOProcessor (other._session, string_compose (_("send %1"), (bitslot = other._session.next_send_id()) + 1), other.placement())
 {
        _metering = false;
-       InsertCreated (this); /* EMIT SIGNAL */
+       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Send::~Send ()
@@ -72,7 +72,7 @@ Send::get_state(void)
 XMLNode&
 Send::state(bool full)
 {
-       XMLNode& node = Redirect::state(full);
+       XMLNode& node = IOProcessor::state(full);
        char buf[32];
        node.add_property ("type", "send");
        snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
@@ -100,32 +100,27 @@ Send::set_state(const XMLNode& node)
        /* Send has regular IO automation (gain, pan) */
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               if ((*niter)->name() == "Redirect") {
+               if ((*niter)->name() == "IOProcessor") {
                        insert_node = *niter;
                } else if ((*niter)->name() == X_("Automation")) {
-                       _io->set_automation_state (*(*niter));
+                       _io->set_automation_state (*(*niter), Parameter(GainAutomation));
                }
        }
        
-       Redirect::set_state (*insert_node);
-
-       if (niter == nlist.end()) {
-               error << _("XML node describing a send is missing a Redirect node") << endmsg;
-               return -1;
-       }
+       IOProcessor::set_state (*insert_node);
 
        return 0;
 }
 
 void
-Send::run (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
+Send::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
 {
        if (active()) {
 
                // we have to copy the input, because IO::deliver_output may alter the buffers
                // in-place, which a send must never do.
 
-               BufferSet& sendbufs = _session.get_send_buffers(bufs.count());
+               BufferSet& sendbufs = _session.get_mix_buffers(bufs.count());
 
                sendbufs.read_from(bufs, nframes);
                assert(sendbufs.count() == bufs.count());
@@ -136,7 +131,7 @@ Send::run (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_
                        if (_io->_gain == 0) {
                                _io->_meter->reset();
                        } else {
-                               _io->_meter->run(_io->output_buffers(), start_frame, end_frame, nframes, offset);
+                               _io->_meter->run_in_place(_io->output_buffers(), start_frame, end_frame, nframes, offset);
                        }
                }
 
@@ -206,7 +201,7 @@ Send::configure_io (ChanCount in, ChanCount out)
        bool success = _io->ensure_io (ChanCount::ZERO, in, false, this) == 0;
 
        if (success) {
-               Insert::configure_io(in, out);
+               Processor::configure_io(in, out);
                _io->reset_panner();
                return true;
        } else {
@@ -217,11 +212,17 @@ Send::configure_io (ChanCount in, ChanCount out)
 ChanCount
 Send::output_streams() const
 {
-       return _io->n_outputs ();
+       // this method reflects the idea that from the perspective of the Route's ProcessorList, 
+       // a send is just a passthrough. that doesn't match what the Send actually does with its 
+       // data, but since what it does is invisible to the Route, it appears to be a passthrough.
+       
+       return _configured_input;
 }
 
 ChanCount
 Send::input_streams() const
 {
-       return _io->n_outputs (); // (sic)
+       return _configured_input;
 }
+
+