diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-19 18:53:27 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-19 18:53:27 -0400 |
commit | 48d11000e5c13ebc831b98c56bc18329e6fc7505 (patch) | |
tree | 789d0200510f9f3d486d50c4948060468dbeb22b /libs/ardour/track.cc | |
parent | cb71d49dc6040e5de8d581d8aca4654406f9014d (diff) |
attempt to fix roll delay logic by moving it into DiskReader (the only place it matters)
Diffstat (limited to 'libs/ardour/track.cc')
-rw-r--r-- | libs/ardour/track.cc | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index 57891968b6..f451a3ed51 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -414,13 +414,6 @@ Track::set_name (const string& str) return ret; } -void -Track::set_latency_compensation (samplecnt_t longest_session_latency) -{ - Route::set_latency_compensation (longest_session_latency); - _disk_reader->set_roll_delay (_roll_delay); -} - int Track::no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool session_state_changing) { @@ -1001,42 +994,6 @@ Track::maybe_declick (BufferSet& bufs, samplecnt_t nframes, int declick) } } -samplecnt_t -Track::check_initial_delay (samplecnt_t nframes, samplepos_t& transport_sample) -{ - if (_roll_delay > nframes) { - - _roll_delay -= nframes; - silence_unlocked (nframes); - /* transport sample is not legal for caller to use */ - return 0; - - } else if (_roll_delay > 0) { - - nframes -= _roll_delay; - silence_unlocked (_roll_delay); - transport_sample += _roll_delay; - - /* shuffle all the port buffers for things that lead "out" of this Route - to reflect that we just wrote _roll_delay samples of silence. - */ - - Glib::Threads::RWLock::ReaderLock lm (_processor_lock); - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr<IOProcessor> iop = boost::dynamic_pointer_cast<IOProcessor> (*i); - if (iop) { - iop->increment_port_buffer_offset (_roll_delay); - } - } - _output->increment_port_buffer_offset (_roll_delay); - - _roll_delay = 0; - - } - - return nframes; -} - void Track::monitoring_changed (bool, Controllable::GroupControlDisposition) { |