From 0fc3bbddb280f237d6c9066caee8712ad8888aa4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 30 Sep 2017 18:46:24 +0200 Subject: [PATCH] remove unused Route::_silent --- libs/ardour/ardour/route.h | 1 - libs/ardour/auditioner.cc | 2 -- libs/ardour/route.cc | 33 +++++++++++---------------------- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 5376635076..83de9c6753 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -659,7 +659,6 @@ protected: bool _denormal_protection; bool _recordable : 1; - bool _silent : 1; bool _declickable : 1; boost::shared_ptr _solo_control; diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index 3c9b784ae1..a202fd8554 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -231,8 +231,6 @@ Auditioner::roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_s BufferSet& bufs = _session.get_route_buffers (n_process_buffers()); - _silent = false; - if (_queue_panic) { MidiBuffer& mbuf (bufs.get_midi (0)); _queue_panic = false; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 28b88c9689..18d5e945e5 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -104,7 +104,6 @@ Route::Route (Session& sess, string name, PresentationInfo::Flag flag, DataType , _meter_type (MeterPeak) , _denormal_protection (false) , _recordable (true) - , _silent (false) , _declickable (false) , _have_internal_generator (false) , _default_type (default_type) @@ -687,7 +686,6 @@ Route::monitor_run (samplepos_t start_sample, samplepos_t end_sample, pframes_t void Route::passthru (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, int declick, bool gain_automation_ok, bool run_disk_reader) { - _silent = false; if (is_monitor() && _session.listening() && !_session.is_auditioning()) { @@ -3106,29 +3104,22 @@ Route::silence_unlocked (samplecnt_t nframes) const samplepos_t now = _session.transport_sample (); - if (!_silent) { + _output->silence (nframes); - _output->silence (nframes); + // update owned automated controllables + automation_run (now, nframes); - // update owned automated controllables - automation_run (now, nframes); + for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { + boost::shared_ptr pi; - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr pi; - - if (!_active && (pi = boost::dynamic_pointer_cast (*i)) != 0) { - /* evaluate automated automation controls */ - pi->automation_run (now, nframes); - /* skip plugins, they don't need anything when we're not active */ - continue; - } - - (*i)->silence (nframes, now); + if (!_active && (pi = boost::dynamic_pointer_cast (*i)) != 0) { + /* evaluate automated automation controls */ + pi->automation_run (now, nframes); + /* skip plugins, they don't need anything when we're not active */ + continue; } - if (nframes == _session.get_block_size()) { - // _silent = true; - } + (*i)->silence (nframes, now); } } @@ -3747,8 +3738,6 @@ Route::roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample return 0; } - _silent = false; - BufferSet& bufs = _session.get_route_buffers (n_process_buffers ()); fill_buffers_with_input (bufs, _input, nframes);