enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index e5c7232f480f7d69db09b5ecec96637d31bbb031..1746b00847e49a739f19293de18269fa3fb4ed62 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; }
 
@@ -58,6 +58,7 @@ InternalSend::InternalSend (Session& s,
 
        init_gain ();
 
+       _send_from->DropReferences.connect_same_thread (source_connection, boost::bind (&InternalSend::send_from_going_away, this));
        CycleStart.connect_same_thread (*this, boost::bind (&InternalSend::cycle_start, this, _1));
 }
 
@@ -73,10 +74,10 @@ InternalSend::init_gain ()
 {
        if (_role == Listen) {
                /* send to monitor bus is always at unity */
-               _amp->set_gain (1.0, this);
+               _gain_control->set_value (GAIN_COEFF_UNITY, PBD::Controllable::NoGroup);
        } else {
                /* aux sends start at -inf dB */
-               _amp->set_gain (0, this);
+               _gain_control->set_value (GAIN_COEFF_ZERO, PBD::Controllable::NoGroup);
        }
 }
 
@@ -117,6 +118,12 @@ InternalSend::target_io_changed ()
        reset_panner();
 }
 
+void
+InternalSend::send_from_going_away ()
+{
+       _send_from.reset();
+}
+
 void
 InternalSend::send_to_going_away ()
 {
@@ -126,7 +133,7 @@ InternalSend::send_to_going_away ()
 }
 
 void
-InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
+InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool)
 {
        if ((!_active && !_pending_active) || !_send_to) {
                _meter->reset ();
@@ -137,14 +144,37 @@ 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 */
-                       
+
                        uint32_t const bufs_audio = bufs.count().get (DataType::AUDIO);
                        uint32_t const mixbufs_audio = mixbufs.count().get (DataType::AUDIO);
-                       
+
                        /* monitor-section has same number of channels as master-bus (on creation).
                         *
                         * There is no clear answer what should happen when trying to PFL or AFL
@@ -187,19 +217,18 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 
                /* target gain has changed */
 
-               Amp::apply_gain (mixbufs, nframes, _current_gain, tgain);
-               _current_gain = tgain;
+               _current_gain = Amp::apply_gain (mixbufs, _session.nominal_frame_rate(), nframes, _current_gain, tgain);
 
-       } else if (tgain == 0.0) {
+       } else if (tgain == GAIN_COEFF_ZERO) {
 
                /* we were quiet last time, and we're still supposed to be quiet.
                */
 
                _meter->reset ();
-               Amp::apply_simple_gain (mixbufs, nframes, 0.0);
+               Amp::apply_simple_gain (mixbufs, nframes, GAIN_COEFF_ZERO);
                goto out;
 
-       } else if (tgain != 1.0) {
+       } else if (tgain != GAIN_COEFF_UNITY) {
 
                /* target gain has not changed, but is not zero or unity */
                Amp::apply_simple_gain (mixbufs, nframes, tgain);
@@ -207,17 +236,17 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 
        _amp->set_gain_automation_buffer (_session.send_gain_automation_buffer ());
        _amp->setup_gain_automation (start_frame, end_frame, nframes);
-       _amp->run (mixbufs, start_frame, end_frame, nframes, true);
+       _amp->run (mixbufs, start_frame, end_frame, speed, nframes, true);
 
-       _delayline->run (mixbufs, start_frame, end_frame, nframes, true);
+       _delayline->run (mixbufs, start_frame, end_frame, speed, nframes, true);
 
        /* consider metering */
 
        if (_metering) {
-               if (_amp->gain_control()->get_value() == 0) {
+               if (_amp->gain_control()->get_value() == GAIN_COEFF_ZERO) {
                        _meter->reset();
                } else {
-                       _meter->run (mixbufs, start_frame, end_frame, nframes, true);
+                       _meter->run (mixbufs, start_frame, end_frame, speed, nframes, true);
                }
        }
 
@@ -268,7 +297,7 @@ InternalSend::get_state()
 int
 InternalSend::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        init_gain ();
 
@@ -394,4 +423,4 @@ InternalSend::cycle_start (pframes_t /*nframes*/)
        for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) {
                b->prepare ();
        }
-}      
+}