ardour/livetrax
13
0
Fork 0
Code

Make internal sends aware of non-audio data

Browse Source 
When most internal sends are created, they are given a panner shell
which is then responsible for audio dispatch. Other data types were left
there without handling them at all. Ensure that all available data is
sent provided the internal send has enough outgoing buffers.
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD 2016-07-09 02:00:27 +02:00
parent 820f99d484
commit 09c4c51335
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/ardour/internal_send.cc
View File

@ -145,6 +145,27 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
if (_panshell && !_panshell->bypassed() && role() != Listen) { if (_panshell && !_panshell->bypassed() && role() != Listen) {
_panshell->run (bufs, mixbufs, start_frame, end_frame, nframes); _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 { } else {
if (role() == Listen) { if (role() == Listen) {
/* We're going to the monitor bus, so discard MIDI data */ /* We're going to the monitor bus, so discard MIDI data */