fix bypassing plugins with sidechain i/o

[ardour.git] / libs / ardour / session_click.cc

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 8e57d7578c107bfe3c8078b60fbb5a2d690526a2..969fdabb825dc3a7370f16c9a0c41654e98a888f 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -20,12 +20,14 @@
 #include <list>
 #include <cerrno>
 
-#include "ardour/ardour.h"
+#include "ardour/amp.h"
+#include "ardour/audio_buffer.h"
+#include "ardour/buffer_set.h"
+#include "ardour/click.h"
+#include "ardour/io.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
-#include "ardour/io.h"
-#include "ardour/buffer_set.h"
-#include "ardour/audio_buffer.h"
+#include "ardour/types.h"
 
 #include <sndfile.h>
 
@@ -35,51 +37,59 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-Pool Click::pool ("click", sizeof (Click), 128);
+Pool Click::pool ("click", sizeof (Click), 1024);
 
 void
 Session::click (framepos_t start, framecnt_t nframes)
 {
-       TempoMap::BBTPointList *points;
+       vector<TempoMap::BBTPoint> points;
        Sample *buf;
+       framecnt_t click_distance;
 
        if (_click_io == 0) {
                return;
        }
 
-       Glib::RWLock::WriterLock clickm (click_lock, Glib::TRY_LOCK);
+       Glib::Threads::RWLock::WriterLock clickm (click_lock, Glib::Threads::TRY_LOCK);
+
+       /* how far have we moved since the last time the clicks got cleared
+        */
+
+       click_distance = start - _clicks_cleared;
 
-       if (!clickm.locked() || _transport_speed != 1.0 || !_clicking || click_data == 0) {
+       if (!clickm.locked() || !_clicking || click_data == 0 || ((click_distance + nframes) < _worst_track_latency)) {
                _click_io->silence (nframes);
                return;
        }
 
+       start -= _worst_track_latency;
+       /* start could be negative at this point */
        const framepos_t end = start + nframes;
+       /* correct start, potentially */
+       start = max (start, (framepos_t) 0);
 
        BufferSet& bufs = get_scratch_buffers(ChanCount(DataType::AUDIO, 1));
        buf = bufs.get_audio(0).data();
-       points = _tempo_map->get_points (start, end);
 
-       if (points == 0) {
-               goto run_clicks;
-       }
+       _tempo_map->get_grid (points, start, end);
 
-       if (points->empty()) {
-               delete points;
+       if (distance (points.begin(), points.end()) == 0) {
                goto run_clicks;
        }
 
-       for (TempoMap::BBTPointList::iterator i = points->begin(); i != points->end(); ++i) {
-               switch ((*i).type) {
-               case TempoMap::Beat:
-                       if (click_emphasis_data == 0 || (click_emphasis_data && (*i).beat != 1)) {
+       for (vector<TempoMap::BBTPoint>::iterator i = points.begin(); i != points.end(); ++i) {
+               switch ((*i).beat) {
+               case 1:
+                       if (click_emphasis_data && Config->get_use_click_emphasis () == true) {
+                               clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data));
+                       } else if (click_data && Config->get_use_click_emphasis () == false) {
                                clicks.push_back (new Click ((*i).frame, click_length, click_data));
                        }
                        break;
 
-               case TempoMap::Bar:
-                       if (click_emphasis_data) {
-                               clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data));
+               default:
+                       if (click_emphasis_data == 0 || (Config->get_use_click_emphasis () == false) || (click_emphasis_data && (*i).beat != 1)) {
+                               clicks.push_back (new Click ((*i).frame, click_length, click_data));
                        }
                        break;
                }
@@ -93,11 +103,8 @@ Session::click (framepos_t start, framecnt_t nframes)
                framecnt_t copy;
                framecnt_t internal_offset;
                Click *clk;
-               list<Click*>::iterator next;
 
                clk = *i;
-               next = i;
-               ++next;
 
                if (clk->start < start) {
                        internal_offset = 0;
@@ -120,13 +127,13 @@ Session::click (framepos_t start, framecnt_t nframes)
 
                if (clk->offset >= clk->duration) {
                        delete clk;
-                       clicks.erase (i);
+                       i = clicks.erase (i);
+               } else {
+                       ++i;
                }
-
-
-               i = next;
        }
 
+       _click_gain->run (bufs, 0, 0, 1.0, nframes, false);
        _click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
 }
 
@@ -219,11 +226,12 @@ Session::setup_click_sounds (int which)
 void
 Session::clear_clicks ()
 {
-       Glib::RWLock::WriterLock lm (click_lock);
+       Glib::Threads::RWLock::WriterLock lm (click_lock);
 
        for (Clicks::iterator i = clicks.begin(); i != clicks.end(); ++i) {
                delete *i;
        }
 
        clicks.clear ();
+       _clicks_cleared = _transport_frame;
 }