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/route.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/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 041640a973..4d473eb740 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -96,7 +96,6 @@ Route::Route (Session& sess, string name, PresentationInfo::Flag flag, DataType , _active (true) , _signal_latency (0) , _initial_delay (0) - , _roll_delay (0) , _disk_io_point (DiskIOPreFader) , _pending_process_reorder (0) , _pending_signals (0) @@ -3353,7 +3352,9 @@ Route::non_realtime_transport_stop (samplepos_t now, bool flush) } } - _roll_delay = _initial_delay; + if (_disk_reader) { + _disk_reader->set_roll_delay (_initial_delay); + } } void @@ -3941,7 +3942,9 @@ Route::set_latency_compensation (samplecnt_t longest_session_latency) } if (_session.transport_stopped()) { - _roll_delay = _initial_delay; + if (_disk_reader) { + _disk_reader->set_roll_delay (_initial_delay); + } } } @@ -4885,7 +4888,10 @@ Route::non_realtime_locate (samplepos_t pos) (*i)->non_realtime_locate (pos); } } - _roll_delay = _initial_delay; + + if (_disk_reader) { + _disk_reader->set_roll_delay (_initial_delay); + } } void |