Fix another hardcoded "tar.xz" -> ARDOUR::session_archive_suffix

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index e7db47ca9d6dc4d79669115013b8175fe761ad6a..72e58b605694f9e8381ac298650bcc3350083fd2 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -23,6 +23,7 @@
 
 #include "ardour/amp.h"
 #include "ardour/audio_buffer.h"
+#include "ardour/delayline.h"
 #include "ardour/internal_return.h"
 #include "ardour/internal_send.h"
 #include "ardour/meter.h"
@@ -99,9 +100,7 @@ InternalSend::use_target (boost::shared_ptr<Route> sendto)
 
        _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()));
-       }
+       _send_delay->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs()));
 
        reset_panner ();
 
@@ -141,7 +140,7 @@ InternalSend::send_to_going_away ()
 }
 
 void
-InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool)
+InternalSend::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool)
 {
        if ((!_active && !_pending_active) || !_send_to) {
                _meter->reset ();
@@ -153,7 +152,7 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 
        if (_panshell && !_panshell->bypassed() && role() != Listen) {
                if (mixbufs.count ().n_audio () > 0) {
-                       _panshell->run (bufs, mixbufs, start_frame, end_frame, nframes);
+                       _panshell->run (bufs, mixbufs, start_sample, end_sample, nframes);
                }
 
                /* non-audio data will not have been copied by the panner, do it now
@@ -230,7 +229,7 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 
                /* target gain has changed */
 
-               _current_gain = Amp::apply_gain (mixbufs, _session.nominal_frame_rate(), nframes, _current_gain, tgain);
+               _current_gain = Amp::apply_gain (mixbufs, _session.nominal_sample_rate(), nframes, _current_gain, tgain);
 
        } else if (tgain == GAIN_COEFF_ZERO) {
 
@@ -248,10 +247,10 @@ 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, speed, nframes, true);
+       _amp->setup_gain_automation (start_sample, end_sample, nframes);
+       _amp->run (mixbufs, start_sample, end_sample, speed, nframes, true);
 
-       _delayline->run (mixbufs, start_frame, end_frame, speed, nframes, true);
+       _send_delay->run (mixbufs, start_sample, end_sample, speed, nframes, true);
 
        /* consider metering */
 
@@ -259,10 +258,12 @@ 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, speed, nframes, true);
+                       _meter->run (mixbufs, start_sample, end_sample, speed, nframes, true);
                }
        }
 
+       _thru_delay->run (bufs, start_sample, end_sample, speed, nframes, true);
+
        /* target will pick up our output when it is ready */
 
   out: