Fix initial sync to LTC with small buffersizes

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 67b0a06b79780aca7251e302500ca1ad811a59ee..e7db47ca9d6dc4d79669115013b8175fe761ad6a 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -19,6 +19,7 @@
 
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
+#include "pbd/types_convert.h"
 
 #include "ardour/amp.h"
 #include "ardour/audio_buffer.h"
@@ -30,7 +31,7 @@
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR { class MuteMaster; class Pannable; }
 
@@ -49,6 +50,7 @@ InternalSend::InternalSend (Session& s,
                bool ignore_bitslot)
        : Send (s, p, mm, role, ignore_bitslot)
        , _send_from (sendfrom)
+       , _allow_feedback (false)
 {
        if (sendto) {
                if (use_target (sendto)) {
@@ -95,6 +97,12 @@ InternalSend::use_target (boost::shared_ptr<Route> sendto)
        mixbufs.ensure_buffers (_send_to->internal_return()->input_streams(), _session.get_block_size());
        mixbufs.set_count (_send_to->internal_return()->input_streams());
 
+       _meter->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs()));
+
+       if (_delayline) {
+               _delayline->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs()));
+       }
+
        reset_panner ();
 
         set_name (sendto->name());
@@ -194,7 +202,8 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
                        */
 
                        uint32_t j = 0;
-                       for (uint32_t i = 0; i < mixbufs_audio; ++i) {
+                       uint32_t i = 0;
+                       for (i = 0; i < mixbufs_audio && j < bufs_audio; ++i) {
                                mixbufs.get_audio(i).read_from (bufs.get_audio(j), nframes);
                                ++j;
 
@@ -202,6 +211,10 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
                                        j = 0;
                                }
                        }
+                       /* in case or MIDI track with 0 audio channels */
+                       for (; i < mixbufs_audio; ++i) {
+                               mixbufs.get_audio(i).silence (nframes);
+                       }
 
                } else {
                        assert (mixbufs.available() >= bufs.count());
@@ -266,10 +279,20 @@ InternalSend::set_block_size (pframes_t nframes)
         return 0;
 }
 
+void
+InternalSend::set_allow_feedback (bool yn)
+{
+       _allow_feedback = yn;
+       _send_from->processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
+}
+
 bool
 InternalSend::feeds (boost::shared_ptr<Route> other) const
 {
-       return _send_to == other;
+       if (_role == Listen || !_allow_feedback) {
+               return _send_to == other;
+       }
+       return false;
 }
 
 XMLNode&
@@ -279,11 +302,12 @@ InternalSend::state (bool full)
 
        /* this replaces any existing "type" property */
 
-       node.add_property ("type", "intsend");
+       node.set_property ("type", "intsend");
 
        if (_send_to) {
-               node.add_property ("target", _send_to->id().to_s());
+               node.set_property ("target", _send_to->id());
        }
+       node.set_property ("allow-feedback", _allow_feedback);
 
        return node;
 }
@@ -297,15 +321,11 @@ InternalSend::get_state()
 int
 InternalSend::set_state (const XMLNode& node, int version)
 {
-       XMLProperty const * prop;
-
        init_gain ();
 
        Send::set_state (node, version);
 
-       if ((prop = node.property ("target")) != 0) {
-
-               _send_to_id = prop->value();
+       if (node.get_property ("target", _send_to_id)) {
 
                /* if we're loading a session, the target route may not have been
                   create yet. make sure we defer till we are sure that it should
@@ -319,6 +339,8 @@ InternalSend::set_state (const XMLNode& node, int version)
                }
        }
 
+       node.get_property (X_("allow-feedback"), _allow_feedback);
+
        return 0;
 }