fix breakage for optimized build caused by semantically critical statement inside...

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

diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc
index c21f04364797e129814c4a2beb124861570b2d36..c13927449ad9df8e68120c3552bfd66e3cb13297 100644 (file)
--- a/libs/ardour/port_insert.cc
+++ b/libs/ardour/port_insert.cc
@@ -19,19 +19,14 @@
 
 #include <string>
 
-
-#include "pbd/failed_constructor.h"
 #include "pbd/xml++.h"
 
-#include "ardour/audioengine.h"
 #include "ardour/audio_port.h"
-#include "ardour/buffer_set.h"
+#include "ardour/audioengine.h"
 #include "ardour/delivery.h"
+#include "ardour/io.h"
 #include "ardour/mtdm.h"
-#include "ardour/plugin.h"
-#include "ardour/port.h"
 #include "ardour/port_insert.h"
-#include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/types.h"
 
@@ -41,8 +36,15 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+string
+PortInsert::name_and_id_new_insert (Session& s, uint32_t& bitslot)
+{
+       bitslot = s.next_insert_id ();
+       return string_compose (_("insert %1"), bitslot+ 1);
+}
+
 PortInsert::PortInsert (Session& s, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster> mm)
-       : IOProcessor (s, true, true, string_compose (_("insert %1"), (bitslot = s.next_insert_id()) + 1), "")
+       : IOProcessor (s, true, true, name_and_id_new_insert (s, _bitslot), "", DataType::AUDIO, true)
        , _out (new Delivery (s, _output, pannable, mm, _name, Delivery::Insert))
 {
         _mtdm = 0;
@@ -53,18 +55,15 @@ PortInsert::PortInsert (Session& s, boost::shared_ptr<Pannable> pannable, boost:
 
 PortInsert::~PortInsert ()
 {
-        _session.unmark_insert_id (bitslot);
+        _session.unmark_insert_id (_bitslot);
         delete _mtdm;
 }
 
 void
 PortInsert::start_latency_detection ()
 {
-        if (_mtdm != 0) {
-                delete _mtdm;
-        }
-
-        _mtdm = new MTDM;
+       delete _mtdm;
+        _mtdm = new MTDM (_session.frame_rate());
         _latency_flush_frames = false;
         _latency_detect = true;
         _measured_latency = 0;
@@ -116,8 +115,9 @@ PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
                         Sample* out = outbuf.data();
 
                         _mtdm->process (nframes, in, out);
-
-                        outbuf.is_silent (false);
+                       
+                        outbuf.set_is_silent (false);
+                        outbuf.set_written (true);
                 }
 
                 return;
@@ -164,7 +164,7 @@ PortInsert::state (bool full)
        XMLNode& node = IOProcessor::state(full);
        char buf[32];
        node.add_property ("type", "port");
-       snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
+       snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot);
        node.add_property ("bitslot", buf);
         snprintf (buf, sizeof (buf), "%" PRId64, _measured_latency);
         node.add_property("latency", buf);
@@ -216,12 +216,14 @@ PortInsert::set_state (const XMLNode& node, int version)
                 _measured_latency = latency;
         }
 
-       if ((prop = node.property ("bitslot")) == 0) {
-               bitslot = _session.next_insert_id();
-       } else {
-                _session.unmark_insert_id (bitslot);
-               sscanf (prop->value().c_str(), "%" PRIu32, &bitslot);
-               _session.mark_insert_id (bitslot);
+       if (!node.property ("ignore-bitslot")) {
+               if ((prop = node.property ("bitslot")) == 0) {
+                       _bitslot = _session.next_insert_id();
+               } else {
+                       _session.unmark_insert_id (_bitslot);
+                       sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+                       _session.mark_insert_id (_bitslot);
+               }
        }
 
        return 0;