One fix.

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 0f7d633ba048be4f9e00cc94a8b63ffa49694ee3..241506bdead180f7caa351746d9d5aca82a47d35 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -30,7 +30,7 @@
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR { class MuteMaster; class Pannable; }
 
@@ -49,6 +49,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)) {
@@ -144,7 +145,30 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
        // in-place, which a send must never do.
 
        if (_panshell && !_panshell->bypassed() && role() != Listen) {
-               _panshell->run (bufs, mixbufs, start_frame, end_frame, nframes);
+               if (mixbufs.count ().n_audio () > 0) {
+                       _panshell->run (bufs, mixbufs, start_frame, end_frame, nframes);
+               }
+
+               /* non-audio data will not have been copied by the panner, do it now
+                * if there are more buffers available than send buffers, ignore them,
+                * if there are less, copy the last as IO::copy_to_output does. */
+
+               for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+                       if (*t != DataType::AUDIO) {
+                               BufferSet::iterator o = mixbufs.begin(*t);
+                               BufferSet::iterator i = bufs.begin(*t);
+
+                               while (i != bufs.end(*t) && o != mixbufs.end(*t)) {
+                                       o->read_from (*i, nframes);
+                                       ++i;
+                                       ++o;
+                               }
+                               while (o != mixbufs.end(*t)) {
+                                       o->silence(nframes, 0);
+                                       ++o;
+                               }
+                       }
+               }
        } else {
                if (role() == Listen) {
                        /* We're going to the monitor bus, so discard MIDI data */
@@ -243,10 +267,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&
@@ -261,6 +295,7 @@ InternalSend::state (bool full)
        if (_send_to) {
                node.add_property ("target", _send_to->id().to_s());
        }
+       node.add_property ("allow-feedback", _allow_feedback);
 
        return node;
 }
@@ -296,6 +331,10 @@ InternalSend::set_state (const XMLNode& node, int version)
                }
        }
 
+       if ((prop = node.property (X_("allow-feedback"))) != 0) {
+               _allow_feedback = string_is_affirmative (prop->value());
+       }
+
        return 0;
 }