X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_click.cc;h=4cb556c8a60d8c9b34aab882df92884cde02aea7;hb=9d867cfd87648e6b441638bda28153f5a9f02092;hp=86a5d4ad788d9bf26b441557457fc2df4f39cb70;hpb=69c7dac1a1ee70c5a4053acdc9dd139c986698a2;p=ardour.git

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 86a5d4ad78..4cb556c8a6 100644
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -20,13 +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/types.h"
 
 #include <sndfile.h>
 
@@ -36,46 +37,60 @@ 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;
+	TempoMap::BBTPointList::const_iterator points_begin;
+	TempoMap::BBTPointList::const_iterator points_end;
 	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);
 
-	if (!clickm.locked() || _transport_speed != 1.0 || !_clicking || click_data == 0) {
+	/* how far have we moved since the last time the clicks got cleared
+	 */
+
+	click_distance = start - _clicks_cleared;
+
+	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();
-	_tempo_map->map (points, start, end);
 
-	if (points.empty()) {
+	_tempo_map->get_grid (points_begin, points_end, start, end);
+
+	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 (TempoMap::BBTPointList::const_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;
 		}
@@ -89,11 +104,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;
@@ -116,13 +128,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, nframes, false);
 	_click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
 }
 
@@ -215,11 +227,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;
 }