smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

auto-ify the main processor loop in process_output_buffers()

Browse source
This commit is contained in:
Paul Davis 2025-06-18 17:28:25 -06:00
parent 0d69983a29
commit 919ce6309c
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libs/ardour/route.cc
View file

@ -529,14 +529,15 @@ Route::process_output_buffers (BufferSet& bufs,
samplecnt_t latency = 0; samplecnt_t latency = 0;
for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) { for (auto const & proc : _processors) {
bool re_inject_oob_data = false; bool re_inject_oob_data = false;
if ((*i) == _disk_reader) {
if (proc == _disk_reader) {
/* ignore port-count from prior plugins, use DR's count. /* ignore port-count from prior plugins, use DR's count.
* see also Route::try_configure_processors_unlocked * see also Route::try_configure_processors_unlocked
*/ */
bufs.set_count ((*i)->output_streams()); bufs.set_count (proc->output_streams());
/* Well now, we've made it past the disk-writer and to the disk-reader. /* Well now, we've made it past the disk-writer and to the disk-reader.
* Time to decide what to do about monitoring. * Time to decide what to do about monitoring.
@ -555,7 +556,7 @@ Route::process_output_buffers (BufferSet& bufs,
} }
double pspeed = speed; double pspeed = speed;
if ((!run_disk_reader && (((*i) == _disk_reader) || ((*i) == _triggerbox))) || (!run_disk_writer && (*i) == _disk_writer)) { if ((!run_disk_reader && ((proc == _disk_reader) || (proc == _triggerbox))) || (!run_disk_writer && proc == _disk_writer)) {
/* run with speed 0, no-roll */ /* run with speed 0, no-roll */
pspeed = 0; pspeed = 0;
} }
@ -574,28 +575,28 @@ Route::process_output_buffers (BufferSet& bufs,
* repeat. * repeat.
*/ */
if ((*i)->active ()) { if (proc->active ()) {
if (speed < 0) { if (speed < 0) {
latency -= (*i)->effective_latency (); latency -= proc->effective_latency ();
} else { } else {
latency += (*i)->effective_latency (); latency += proc->effective_latency ();
} }
} }
if (speed < 0) { if (speed < 0) {
(*i)->run (bufs, start_sample + latency, end_sample + latency, pspeed, nframes, *i != _processors.back()); proc->run (bufs, start_sample + latency, end_sample + latency, pspeed, nframes, proc != _processors.back());
} else { } else {
(*i)->run (bufs, start_sample - latency, end_sample - latency, pspeed, nframes, *i != _processors.back()); proc->run (bufs, start_sample - latency, end_sample - latency, pspeed, nframes, proc != _processors.back());
} }
bufs.set_count ((*i)->output_streams()); bufs.set_count (proc->output_streams());
if (re_inject_oob_data) { if (re_inject_oob_data) {
write_out_of_band_data (bufs, nframes); write_out_of_band_data (bufs, nframes);
} }
#if 0 #if 0
if ((*i) == _delayline) { if (proc == _delayline) {
latency += _delayline->delay (); latency += _delayline->delay ();
} }
#endif #endif