From e545e6691155169f321ad8cb20133769320e3b9c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 17 Mar 2019 18:38:07 +0100 Subject: [PATCH] Temporary change to make auto-return work with broken transport-logic Revert this once transport state machine waits for de-click! This causes audible-clicks on stop, but prevents audible artifacts on LocateRoll with the current transport-control-logic. --- libs/ardour/disk_reader.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index bb41945af5..4622d14a8f 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -603,7 +603,7 @@ DiskReader::seek (samplepos_t sample, bool complete_refill) /* this should not happen. new transport should postponse seeking * until de-click is complete */ printf ("LOCATE WITHOUT DECLICK (gain=%f) at %ld seek-to %ld\n", _declick_amp.gain (), playback_sample, sample); - return -1; + //return -1; } if (sample == playback_sample && !complete_refill) { return 0; // XXX double-check this @@ -614,7 +614,7 @@ DiskReader::seek (samplepos_t sample, bool complete_refill) //sample = std::max ((samplecnt_t)0, sample -_session.worst_output_latency ()); - printf ("DiskReader::seek %s %ld -> %ld refill=%d\n", owner()->name().c_str(), playback_sample, sample, complete_refill); + //printf ("DiskReader::seek %s %ld -> %ld refill=%d\n", owner()->name().c_str(), playback_sample, sample, complete_refill); // TODO: check if we can micro-locate for (n = 0, chan = c->begin(); chan != c->end(); ++chan, ++n) {