ardour/livetrax
13
0
Fork 0
Code

Make Delivery::run more Datatype-agnostic

Browse Source 
Note that checking the number of output ports is not needed because
IO::copy_to_outputs() will stop if there are less ports of the right
type than buffers (or even none).
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD 2016-07-09 01:07:16 +02:00
parent d6534eb143
commit 820f99d484
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/ardour/delivery.cc
View File

@ -297,22 +297,28 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, do
_panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes);
// MIDI data will not have been delivered by the panner
// non-audio data will not have been delivered by the panner
if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
_output->copy_to_outputs (bufs, DataType::MIDI, nframes, ports.port(0)->port_offset());
for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
if (*t != DataType::AUDIO && bufs.count().get(*t) > 0) {
_output->copy_to_outputs (bufs, *t, nframes, ports.port(0)->port_offset());
}
}
} else {
// Do a 1:1 copy of data to output ports
if (bufs.count().n_audio() > 0 && ports.count().n_audio () > 0) {
// audio is handled separately because we use 0 for the offset
// XXX how does this interact with Port::increment_global_port_buffer_offset ?
if (bufs.count().n_audio() > 0) {
_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, ports.port(0)->port_offset());
for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
if (*t != DataType::AUDIO && bufs.count().get(*t) > 0) {
_output->copy_to_outputs (bufs, *t, nframes, ports.port(0)->port_offset());
}
}
}