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

clean up logic for declick out in DiskReader

Browse source 
This is intended to be a no-op that makes the code easier to read/reason about
This commit is contained in:
Paul Davis 2020-03-31 20:53:09 -06:00
parent 88e84067f2
commit 0047dc383f
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libs/ardour/disk_reader.cc
View file

@ -280,18 +280,33 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
} }
const gain_t target_gain = ((speed == 0.0) || ((ms & MonitoringDisk) == 0)) ? 0.0 : 1.0; const gain_t target_gain = ((speed == 0.0) || ((ms & MonitoringDisk) == 0)) ? 0.0 : 1.0;
const bool declicked_out = (_declick_amp.gain() == target_gain) && target_gain == 0.0; bool declick_out = (_declick_amp.gain() != target_gain) && target_gain == 0.0;
const bool declick_out = (_declick_amp.gain() != target_gain) && target_gain == 0.0;
if (!_session.cfg ()->get_use_transport_fades () || (_session.exporting () && ! _session.realtime_export ())) { if (!_session.cfg ()->get_use_transport_fades () || (_session.exporting () && ! _session.realtime_export ())) {
_declick_amp.set_gain (target_gain);
}
if (declicked_out && (ms == MonitoringDisk)) { /* no transport fades or exporting - no declick out logic */
/* Stopped and declicking has finished. Don't accidentally pass
* any data from disk into our outputs (e.g. via interpolation) _declick_amp.set_gain (target_gain);
*/ declick_out = false;
return;
} else {
/* using transport fades and not exporting - declick login in effect */
if (ms == MonitoringDisk) {
/* Only monitoring from disk, so if we've finished a
* declick (for stop/locate), do not accidentally pass
* any data from disk to our outputs.
*/
if ((target_gain == 0.0) && (_declick_amp.gain() == target_gain)) {
/* we were heading for zero (declick out for
stop), and we've reached there. Done.
*/
return;
}
}
} }
BufferSet& scratch_bufs (_session.get_scratch_buffers (bufs.count())); BufferSet& scratch_bufs (_session.get_scratch_buffers (bufs.count()));