Fix MidiBuffer::merge_in_place and add aggressive correctness checking.

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

diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc
index 5559ac0e041e960a9ab3fd475ac598d77dca5eb2..3b02bf41daa6672e1c9ef91720a03763efc8f491 100644 (file)
--- a/libs/ardour/port_insert.cc
+++ b/libs/ardour/port_insert.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000,2007 Paul Davis 
+    Copyright (C) 2000,2007 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
@@ -24,6 +24,7 @@
 #include "pbd/failed_constructor.h"
 #include "pbd/xml++.h"
 
+#include "ardour/delivery.h"
 #include "ardour/port_insert.h"
 #include "ardour/plugin.h"
 #include "ardour/port.h"
@@ -40,31 +41,19 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-PortInsert::PortInsert (Session& s, Placement p)
-       : IOProcessor (s, string_compose (_("insert %1"), (bitslot = s.next_insert_id()) + 1), p, 1, -1, 1, -1)
+PortInsert::PortInsert (Session& s, boost::shared_ptr<MuteMaster> mm)
+       : IOProcessor (s, true, true, string_compose (_("insert %1"), (bitslot = s.next_insert_id()) + 1), "")
+       , _out (new Delivery (s, _output, mm, _name, Delivery::Insert))
 {
-       init ();
        ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
-void
-PortInsert::init ()
-{
-       if (_io->add_input_port ("", this)) {
-               error << _("PortInsert: cannot add input port") << endmsg;
-               throw failed_constructor();
-       }
-       
-       if (_io->add_output_port ("", this)) {
-               error << _("PortInsert: cannot add output port") << endmsg;
-               throw failed_constructor();
-       }
-}
+PortInsert::PortInsert (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node)
+       : IOProcessor (s, true, true, "unnamed port insert")
+       , _out (new Delivery (s, _output, mm, _name, Delivery::Insert))
 
-PortInsert::PortInsert (Session& s, const XMLNode& node)
-       : IOProcessor (s, "unnamed port insert", PreFader)
 {
-       if (set_state (node)) {
+       if (set_state (node, Stateful::loading_state_version)) {
                throw failed_constructor();
        }
 
@@ -77,21 +66,23 @@ PortInsert::~PortInsert ()
 }
 
 void
-PortInsert::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
+PortInsert::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
 {
-       if (_io->n_outputs().n_total() == 0) {
+       if (_output->n_ports().n_total() == 0) {
                return;
        }
 
-       if (!active()) {
+       if (!_active && !_pending_active) {
                /* deliver silence */
-               _io->silence (nframes, offset);
-               return;
+               silence (nframes);
+               goto out;
        }
 
-       _io->deliver_output(bufs, start_frame, end_frame, nframes, offset);
+       _out->run (bufs, start_frame, end_frame, nframes);
+       _input->collect_input (bufs, nframes, ChanCount::ZERO);
 
-       _io->collect_input(bufs, nframes, offset);
+  out:
+       _active = _pending_active;
 }
 
 XMLNode&
@@ -103,7 +94,7 @@ PortInsert::get_state(void)
 XMLNode&
 PortInsert::state (bool full)
 {
-       XMLNode& node = IOProcessor::state(full);
+       XMLNode& node = Processor::state(full);
        char buf[32];
        node.add_property ("type", "port");
        snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
@@ -113,7 +104,7 @@ PortInsert::state (bool full)
 }
 
 int
-PortInsert::set_state(const XMLNode& node)
+PortInsert::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
@@ -124,7 +115,7 @@ PortInsert::set_state(const XMLNode& node)
                error << _("XML node describing port insert is missing the `type' field") << endmsg;
                return -1;
        }
-       
+
        if (prop->value() != "port") {
                error << _("non-port insert XML used for port plugin insert") << endmsg;
                return -1;
@@ -146,13 +137,13 @@ PortInsert::set_state(const XMLNode& node)
                        break;
                }
        }
-       
-       IOProcessor::set_state (*insert_node);
+
+       Processor::set_state (*insert_node, version);
 
        return 0;
 }
 
-ARDOUR::nframes_t 
+ARDOUR::nframes_t
 PortInsert::signal_latency() const
 {
        /* because we deliver and collect within the same cycle,
@@ -162,52 +153,38 @@ PortInsert::signal_latency() const
           need to take that into account too.
        */
 
-       return _session.engine().frames_per_cycle() + _io->input_latency();
+       return _session.engine().frames_per_cycle() + _input->signal_latency();
 }
 
 bool
 PortInsert::configure_io (ChanCount in, ChanCount out)
 {
-       /* do not allow configuration to be changed outside the range of
-          the last request config. or something like that.
-       */
-
-       /* this is a bit odd: 
-
-          the number of inputs we are required to handle corresponds 
-          to the number of output ports we need.
-
-          the number of outputs we are required to have corresponds
-          to the number of input ports we need.
-       */
+       /* for an insert, processor input corresponds to IO output, and vice versa */
 
-       _io->set_output_maximum (in);
-       _io->set_output_minimum (in);
-       _io->set_input_maximum (out);
-       _io->set_input_minimum (out);
+       if (_input->ensure_io (in, false, this) != 0) {
+               return false;
+       }
 
-       if (_io->ensure_io (out, in, false, this) != 0) {
+       if (_output->ensure_io (out, false, this) != 0) {
                return false;
        }
 
        return Processor::configure_io (in, out);
 }
 
-ChanCount
-PortInsert::output_streams() const
-{
-       return _io->n_inputs ();
-}
-
-ChanCount
-PortInsert::input_streams() const
-{
-       return _io->n_outputs ();
-}
-
 bool
 PortInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
        out = in;
        return true;
 }
+
+bool
+PortInsert::set_name (const std::string& name)
+{
+       bool ret = Processor::set_name (name);
+
+       ret = (_input->set_name (name) || _output->set_name (name));
+
+       return ret;
+}