diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-07 19:06:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-07 19:06:42 +0000 |
| commit | 665f3bea5a7b145636b6d85bb3623013e38f1819 (patch) | |
| tree | 56c8e8d1436eef6a4fd8134a89d73d3d5648c0d4 /libs/ardour/delivery.cc | |
| parent | 61cbf95f9973234ccf77f0a321860b783e47d82f (diff) | |
fix all manner of wrongness with port buffer offsets
git-svn-id: svn://localhost/ardour2/branches/3.0@9098 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/delivery.cc')
| -rw-r--r-- | libs/ardour/delivery.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index bc2d7b8081..157d8a285d 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -27,6 +27,7 @@ #include "ardour/debug.h" #include "ardour/delivery.h" #include "ardour/audio_buffer.h" +#include "ardour/audio_port.h" #include "ardour/amp.h" #include "ardour/buffer_set.h" #include "ardour/configuration.h" @@ -253,7 +254,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf processing pathway that wants to use this->output_buffers() for some reason. */ - output_buffers().get_jack_port_addresses (ports, nframes, _output_offset); + output_buffers().get_jack_port_addresses (ports, nframes); // this Delivery processor is not a derived type, and thus we assume // we really can modify the buffers passed in (it is almost certainly @@ -289,7 +290,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf panner = _panshell->panner(); if (panner && !panner->bypassed()) { - + // Use the panner to distribute audio to output port buffers _panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes); @@ -300,11 +301,11 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf // Do a 1:1 copy of data to output ports if (bufs.count().n_audio() > 0 && ports.count().n_audio () > 0) { - _output->copy_to_outputs (bufs, DataType::AUDIO, nframes, _output_offset); + _output->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0); } if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) { - _output->copy_to_outputs (bufs, DataType::MIDI, nframes, _output_offset); + _output->copy_to_outputs (bufs, DataType::MIDI, nframes, 0); } } @@ -451,7 +452,7 @@ Delivery::flush_buffers (framecnt_t nframes, framepos_t time) PortSet& ports (_output->ports()); for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) { - (*i).flush_buffers (nframes, time, _output_offset); + (*i).flush_buffers (nframes, time); } } |