diff options
| author | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2016-07-15 01:43:14 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-14 21:55:49 -0400 |
| commit | 8af589b322408aba38413dc2c85dc77ae1c9f2e4 (patch) | |
| tree | a8b99e1462efe92f6a9c6b40ba9e9f59fb56436b /libs/ardour/route.cc | |
| parent | bfc6b6a3ab737da3073d69284b7438bfa65a72ec (diff) | |
Consolidate delivery buffer flushing of all route types
Route::no_roll(), Route::roll(), Track::no_roll(), AudioTrack::roll()
and MidiTrack::roll() all had the exact same loop for flushing buffers
of their Delivery processors. That was a lot of replicated code that had
to be kept synchronised by hand. Put that code into a protected method
Route::flush_processor_buffers_locked() which is called instead.
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 01580456e4..cd670df02e 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -3391,6 +3391,17 @@ Route::pans_required () const return max (n_inputs ().n_audio(), processor_max_streams.n_audio()); } +void +Route::flush_processor_buffers_locked (framecnt_t nframes) +{ + for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { + boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i); + if (d) { + d->flush_buffers (nframes); + } + } +} + int Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool session_state_changing) { @@ -3436,12 +3447,8 @@ Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, _trim->apply_gain_automation (false); passthru (bufs, start_frame, end_frame, nframes, 0); - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i); - if (d) { - d->flush_buffers (nframes); - } - } + flush_processor_buffers_locked (nframes); + return 0; } @@ -3480,12 +3487,8 @@ Route::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, in passthru (bufs, start_frame, end_frame, nframes, declick); - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i); - if (d) { - d->flush_buffers (nframes); - } - } + flush_processor_buffers_locked (nframes); + return 0; } |