allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Revert "remove unusued roll_delay member of DiskReader"

Browse Source 
This reverts commit 92c2e06eb72950f91ca943a5219e2caeaeecda9f.
This commit is contained in:
Paul Davis
2017-09-19 10:09:37 -04:00
parent 41bd6d3721
commit ebf6856579
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,9 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
int overwrite_existing_buffers ();
void set_pending_overwrite (bool yn);
samplecnt_t roll_delay() const { return _roll_delay; }
void set_roll_delay (samplecnt_t);
virtual XMLNode& state (bool full);
int set_state (const XMLNode&, int version);
@@ -111,6 +114,10 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
void playlist_ranges_moved (std::list< Evoral::RangeMove<samplepos_t> > const &, bool);
private:
/** The number of samples by which this diskstream's output should be delayed
with respect to the transport sample. This is used for latency compensation.
*/
samplecnt_t _roll_delay;
samplepos_t overwrite_sample;
off_t overwrite_offset;
bool _pending_overwrite;

7
libs/ardour/disk_reader.cc
View File

@@ -49,6 +49,7 @@ bool DiskReader::_no_disk_output = false;
DiskReader::DiskReader (Session& s, string const & str, DiskIOProcessor::Flag f)
: DiskIOProcessor (s, str, f)
, _roll_delay (0)
, overwrite_sample (0)
, overwrite_offset (0)
, _pending_overwrite (false)
@@ -125,6 +126,12 @@ DiskReader::set_name (string const & str)
return true;
}
void
DiskReader::set_roll_delay (ARDOUR::samplecnt_t nframes)
{
_roll_delay = nframes;
}
XMLNode&
DiskReader::state (bool full)
{