ardour/livetrax
13
0
Fork 0
Code

NO-OP: reduce scope

Browse Source
This commit is contained in:
Robin Gareus 2020-03-12 02:13:27 +01:00
parent dd30b8b31e
commit 33f85b094b
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
libs/ardour/internal_send.cc
View File

@ -184,50 +184,49 @@ InternalSend::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sa
} }
} }
} }
} 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 */
uint32_t const bufs_audio = bufs.count ().get (DataType::AUDIO); uint32_t const bufs_audio = bufs.count ().get (DataType::AUDIO);
uint32_t const mixbufs_audio = mixbufs.count ().get (DataType::AUDIO); uint32_t const mixbufs_audio = mixbufs.count ().get (DataType::AUDIO);
/* monitor-section has same number of channels as master-bus (on creation). /* monitor-section has same number of channels as master-bus (on creation).
* *
* There is no clear answer what should happen when trying to PFL or AFL * There is no clear answer what should happen when trying to PFL or AFL
* a track that has more channels (bufs_audio from source-track is * a track that has more channels (bufs_audio from source-track is
* larger than mixbufs). * larger than mixbufs).
* *
* There are two options: * There are two options:
* 1: discard additional channels (current) * 1: discard additional channels (current)
* OR * OR
* 2: require the monitor-section to have at least as many channels * 2: require the monitor-section to have at least as many channels
* as the largest count of any route * as the largest count of any route
*/ */
//assert (mixbufs.available().get (DataType::AUDIO) >= bufs_audio); //assert (mixbufs.available().get (DataType::AUDIO) >= bufs_audio);
/* Copy bufs into mixbufs, going round bufs more than once if necessary /* Copy bufs into mixbufs, going round bufs more than once if necessary
* to ensure that every mixbuf gets some data. * to ensure that every mixbuf gets some data.
*/ */
uint32_t j = 0; uint32_t j = 0;
uint32_t i = 0; uint32_t i = 0;
for (i = 0; i < mixbufs_audio && j < bufs_audio; ++i) { for (i = 0; i < mixbufs_audio && j < bufs_audio; ++i) {
mixbufs.get_audio (i).read_from (bufs.get_audio (j), nframes); mixbufs.get_audio (i).read_from (bufs.get_audio (j), nframes);
++j; ++j;
if (j == bufs_audio) { if (j == bufs_audio) {
j = 0; j = 0;
}
} }
/* in case or MIDI track with 0 audio channels */
for (; i < mixbufs_audio; ++i) {
mixbufs.get_audio (i).silence (nframes);
}
} else {
assert (mixbufs.available () >= bufs.count ());
mixbufs.read_from (bufs, nframes);
} }
/* in case or MIDI track with 0 audio channels */
for (; i < mixbufs_audio; ++i) {
mixbufs.get_audio (i).silence (nframes);
}
} else {
/* no panner or panner is bypassed */
assert (mixbufs.available () >= bufs.count ());
mixbufs.read_from (bufs, nframes);
} }
/* main gain control: * mute & bypass/enable */ /* main gain control: * mute & bypass/enable */