#include "ardour/session.h"
#include "ardour/audioengine.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
namespace ARDOUR { class MuteMaster; class Pannable; }
}
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 ();
// 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 */
_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 (_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);
}
}