diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-07-20 17:53:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
| commit | 66c5fe41ee937f2e8b85a4a655aa4d3e6e6fee5b (patch) | |
| tree | cd3d5c9cab7c08f4e70ffe06b8caac029a067871 /libs/ardour/disk_reader.cc | |
| parent | 144f95c3056bb62d3f2445b7746eebce7c0e1ad5 (diff) | |
framework for silent-roll-while-slave-syncing
Diffstat (limited to 'libs/ardour/disk_reader.cc')
| -rw-r--r-- | libs/ardour/disk_reader.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 918761e537..c7221ad90f 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -44,6 +44,7 @@ PBD::Signal0<void> DiskReader::Underrun; Sample* DiskReader::_mixdown_buffer = 0; gain_t* DiskReader::_gain_buffer = 0; framecnt_t DiskReader::midi_readahead = 4096; +bool DiskReader::no_disk_output = false; DiskReader::DiskReader (Session& s, string const & str, DiskIOProcessor::Flag f) : DiskIOProcessor (s, str, f) @@ -289,7 +290,7 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, } } - /* if monitoring disk but locating, put silence in the buffers */ + /* if monitoring disk but locating put silence in the buffers */ if (still_locating && (ms == MonitoringDisk)) { bufs.silence (playback_distance, 0); @@ -380,7 +381,7 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, chaninfo->buf->increment_read_ptr (playback_distance); - if ((speed != 0.0) && (ms & MonitoringInput)) { + if (!no_disk_output && (speed != 0.0) && (ms & MonitoringInput)) { /* mix the disk signal into the input signal (already in bufs) */ mix_buffers_no_gain (output.data(), disk_signal, speed == 0.0 ? nframes : playback_distance); } @@ -1465,3 +1466,16 @@ DiskReader::refill_midi () return ret; } + +void +DiskReader::set_no_disk_output (bool yn) +{ + /* this MUST be called as part of the process call tree, before any + disk readers are invoked. We use it when the session needs the + transport (and thus effective read position for DiskReaders) to keep + advancing as part of syncing up with a transport master, but we + don't want any actual disk output yet because we are still not + synced. + */ + no_disk_output = yn; +} |