fix up and re-enable MTC transmission

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

diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc
index 53903c4b3444edd0bbb36b84c9212b257618f974..e14835b0832bda0491bdbe706e06746b37082f14 100644 (file)
--- a/libs/ardour/port_insert.cc
+++ b/libs/ardour/port_insert.cc
@@ -41,17 +41,17 @@ using namespace ARDOUR;
 using namespace PBD;
 
 PortInsert::PortInsert (Session& s, Placement p)
-       : Redirect (s, string_compose (_("insert %1"), (bitslot = s.next_insert_id()) + 1), p, 1, -1, 1, -1)
+       : IOProcessor (s, string_compose (_("insert %1"), (bitslot = s.next_insert_id()) + 1), p, 1, -1, 1, -1)
 {
        init ();
-       InsertCreated (this); /* EMIT SIGNAL */
+       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 PortInsert::PortInsert (const PortInsert& other)
-       : Redirect (other._session, string_compose (_("insert %1"), (bitslot = other._session.next_insert_id()) + 1), other.placement(), 1, -1, 1, -1)
+       : IOProcessor (other._session, string_compose (_("insert %1"), (bitslot = other._session.next_insert_id()) + 1), other.placement(), 1, -1, 1, -1)
 {
        init ();
-       InsertCreated (this); /* EMIT SIGNAL */
+       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 void
@@ -69,13 +69,13 @@ PortInsert::init ()
 }
 
 PortInsert::PortInsert (Session& s, const XMLNode& node)
-       : Redirect (s, "unnamed port insert", PreFader)
+       : IOProcessor (s, "unnamed port insert", PreFader)
 {
        if (set_state (node)) {
                throw failed_constructor();
        }
 
-       InsertCreated (this); /* EMIT SIGNAL */
+       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 PortInsert::~PortInsert ()
@@ -84,7 +84,7 @@ PortInsert::~PortInsert ()
 }
 
 void
-PortInsert::run (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
+PortInsert::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
 {
        if (_io->n_outputs().n_total() == 0) {
                return;
@@ -110,7 +110,7 @@ PortInsert::get_state(void)
 XMLNode&
 PortInsert::state (bool full)
 {
-       XMLNode& node = Redirect::state(full);
+       XMLNode& node = IOProcessor::state(full);
        char buf[32];
        node.add_property ("type", "port");
        snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
@@ -128,7 +128,7 @@ PortInsert::set_state(const XMLNode& node)
        const XMLProperty *prop;
 
        if ((prop = node.property ("type")) == 0) {
-               error << _("XML node describing insert is missing the `type' field") << endmsg;
+               error << _("XML node describing port insert is missing the `type' field") << endmsg;
                return -1;
        }
        
@@ -146,21 +146,21 @@ PortInsert::set_state(const XMLNode& node)
 
        const XMLNode* insert_node = &node;
 
-       // legacy sessions: search for child Redirect node
+       // legacy sessions: search for child IOProcessor node
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               if ((*niter)->name() == "Redirect") {
+               if ((*niter)->name() == "IOProcessor") {
                        insert_node = *niter;
                        break;
                }
        }
        
-       Redirect::set_state (*insert_node);
+       IOProcessor::set_state (*insert_node);
 
        return 0;
 }
 
 ARDOUR::nframes_t 
-PortInsert::latency() 
+PortInsert::signal_latency() const
 {
        /* because we deliver and collect within the same cycle,
           all I/O is necessarily delayed by at least frames_per_cycle().
@@ -227,7 +227,7 @@ PortInsert::configure_io (ChanCount in, ChanCount out)
        bool success = (_io->ensure_io (out, in, false, this) == 0);
 
        if (success)
-               return Insert::configure_io(in, out);
+               return Processor::configure_io(in, out);
        else
                return false;
 }