Report quarter note rather than beat position to AU plugins.

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index fe57176ac7d5e213c3ae44d0965b662b74f55d3a..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; }
 
@@ -74,10 +74,10 @@ InternalSend::init_gain ()
 {
        if (_role == Listen) {
                /* send to monitor bus is always at unity */
-               _amp->set_gain (GAIN_COEFF_UNITY, this);
+               _gain_control->set_value (GAIN_COEFF_UNITY, PBD::Controllable::NoGroup);
        } else {
                /* aux sends start at -inf dB */
-               _amp->set_gain (GAIN_COEFF_ZERO, this);
+               _gain_control->set_value (GAIN_COEFF_ZERO, PBD::Controllable::NoGroup);
        }
 }
 
@@ -133,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 ();
@@ -144,7 +144,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 */
@@ -190,27 +213,32 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 
        gain_t tgain = target_gain ();
 
-       _amp->set_gain (tgain, this);
+       if (tgain != _current_gain) {
+
+               /* target gain has changed */
+
+               _current_gain = Amp::apply_gain (mixbufs, _session.nominal_frame_rate(), nframes, _current_gain, tgain);
+
+       } else if (tgain == GAIN_COEFF_ZERO) {
 
-       if (tgain == GAIN_COEFF_ZERO && _amp->gain() == GAIN_COEFF_ZERO) {
                /* we were quiet last time, and we're still supposed to be quiet.
-                */
+               */
 
                _meter->reset ();
                Amp::apply_simple_gain (mixbufs, nframes, GAIN_COEFF_ZERO);
                goto out;
 
-       }
+       } else if (tgain != GAIN_COEFF_UNITY) {
 
-       /* These two calls will either set up gain automation or mark
-          the amp as ready to use a simple scalar gain.
-       */
+               /* target gain has not changed, but is not zero or unity */
+               Amp::apply_simple_gain (mixbufs, nframes, tgain);
+       }
 
        _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 */
 
@@ -218,7 +246,7 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
                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);
                }
        }
 
@@ -269,7 +297,7 @@ InternalSend::get_state()
 int
 InternalSend::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        init_gain ();