ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Small steps towards rolling backwards..

Browse Source
This commit is contained in:
Robin Gareus 2017-10-31 03:51:08 +01:00
parent 9a2433eacf
commit 3b785b9d35
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/ardour/route.cc
View File

@ -360,14 +360,18 @@ Route::process_output_buffers (BufferSet& bufs,
* By the Time T=0 is reached (dt=15 later) that sample is audible.
*/
start_sample += _signal_latency;
end_sample += _signal_latency;
start_sample += _output->latency ();
end_sample += _output->latency ();
const double speed = (is_auditioner() ? 1.0 : _session.transport_speed ());
const sampleoffset_t latency_offset = _signal_latency + _output->latency ();
if (speed < 0) {
/* when rolling backwards this can become negative */
start_sample -= latency_offset;
end_sample -= latency_offset;
} else {
start_sample += latency_offset;
end_sample += latency_offset;
}
/* Note: during intial pre-roll 'start_sample' as passed as argument can be negative.
* Functions calling process_output_buffers() will set "run_disk_reader"
* to false if the pre-roll count-down is larger than playback_latency ().
@ -386,7 +390,7 @@ Route::process_output_buffers (BufferSet& bufs,
* given that
*/
bool run_disk_writer = false;
if (_disk_writer && speed != 0) {
if (_disk_writer && speed > 0) {
samplecnt_t latency_preroll = _session.remaining_latency_preroll ();
run_disk_writer = latency_preroll < nframes + (_signal_latency + _output->latency ());
if (end_sample - _disk_writer->input_latency () < _session.transport_sample ()) {
@ -514,7 +518,11 @@ Route::process_output_buffers (BufferSet& bufs,
pspeed = 0;
}
(*i)->run (bufs, start_sample - latency, end_sample - latency, pspeed, nframes, *i != _processors.back());
if (speed < 0) {
(*i)->run (bufs, start_sample + latency, end_sample + latency, pspeed, nframes, *i != _processors.back());
} else {
(*i)->run (bufs, start_sample - latency, end_sample - latency, pspeed, nframes, *i != _processors.back());
}
bufs.set_count ((*i)->output_streams());