ardour/livetrax
13
0
Fork 0
Code

Set de-click reason monitor vs. start/stop.

Browse Source 
Previously use-monitor-fades was unused in A6, and transition
between monitoring states used the use-transport-fades preference.
This commit is contained in:
Robin Gareus 2020-05-04 21:51:53 +02:00
parent a6f95b21fc
commit 4508d5bab1
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/disk_reader.h
View File

@ -210,6 +210,7 @@ private:
DeclickAmp _declick_amp;
sampleoffset_t _declick_offs;
bool _declick_enabled;
MidiStateTracker _tracker;
boost::optional<bool> _last_read_reversed;
boost::optional<bool> _last_read_loop;

16
libs/ardour/disk_reader.cc
View File

@ -63,6 +63,7 @@ DiskReader::DiskReader (Session& s, string const& str, DiskIOProcessor::Flag f)
, run_must_resolve (false)
, _declick_amp (s.nominal_sample_rate ())
, _declick_offs (0)
, _declick_enabled (false)
{
file_sample[DataType::AUDIO] = 0;
file_sample[DataType::MIDI] = 0;
@ -284,7 +285,16 @@ 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;
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 (declick_out && _declick_amp.gain () == GAIN_COEFF_UNITY) {
/* beginning a de-click, set de-click reason */
if (speed == 0) {
_declick_enabled = _session.cfg ()->get_use_transport_fades ();
} else {
_declick_enabled = _session.cfg ()->get_use_monitor_fades ();
}
}
if (!_declick_enabled || (_session.exporting () && !_session.realtime_export ())) {
/* no transport fades or exporting - no declick out logic */
if (!midi_only) {
@ -505,10 +515,10 @@ midi:
bool
DiskReader::declick_in_progress () const
{
if (!_session.cfg ()->get_use_transport_fades () || (_session.exporting () && !_session.realtime_export ())) {
if (!_declick_enabled || (_session.exporting () && !_session.realtime_export ())) {
return false;
}
return (_declick_amp.gain () != 0); // declick-out
return _declick_amp.gain () != 0; // declick-out
}
void