diff options
| author | Robin Gareus <robin@gareus.org> | 2015-04-07 15:05:00 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-04-07 15:05:00 +0200 |
| commit | 0ffde76e599f6f82f75bea9e8bc566b121f55c72 (patch) | |
| tree | 20b4aa80300be81e6cfcdaaead220634e13e3eef | |
| parent | 2bbe4baf297808a064a0e34fbd4a83183561c07f (diff) | |
Revert "prevent double declicks (click after RecStop)"
This reverts commit 6ba555c2f57fb793431aef0cedfbacf11d643a2b.
which does not yet take monitoring states into account.
Ideally the case handled here should not happen in the
first place, It should be fixed in session_transport
transport_sub_state.
| -rw-r--r-- | libs/ardour/ardour/route.h | 1 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 21610cc27f..5d52fc0c52 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -506,7 +506,6 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou framecnt_t _signal_latency_at_amp_position; framecnt_t _initial_delay; framecnt_t _roll_delay; - bool _declicked_silent; ProcessorList _processors; mutable Glib::Threads::RWLock _processor_lock; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index ab341b7f34..36adbfa148 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -83,7 +83,6 @@ Route::Route (Session& sess, string name, Flag flg, DataType default_type) , _signal_latency_at_amp_position (0) , _initial_delay (0) , _roll_delay (0) - , _declicked_silent (true) , _flags (flg) , _pending_declick (true) , _meter_point (MeterPostFader) @@ -466,18 +465,7 @@ Route::process_output_buffers (BufferSet& bufs, GLOBAL DECLICK (for transport changes etc.) ----------------------------------------------------------------------------------------- */ - if (_declickable && _declicked_silent && declick <= 0) { - bufs.silence (nframes, 0); - } - maybe_declick (bufs, nframes, declick); - - if (declick < 0) { - _declicked_silent = true; - } - else if (declick > 0) { - _declicked_silent = false; - } _pending_declick = 0; /* ------------------------------------------------------------------------------------------- |