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.

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 21610cc27f0066093f74082ce21e5094feeaa7a8..5d52fc0c52493e5436f87b34843bd520bdb01aa4 100644 (file)
--- 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 ab341b7f3418a16c649da6db746a79fa72b3ad6d..36adbfa148f6b4e9442a5bb5495a80e78703e3f3 100644 (file)
--- 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;
 
        /* -------------------------------------------------------------------------------------------