X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_click.cc;h=9c67ebef869c99d6d8b22101815d58f7e102b832;hb=d92686afb4105b84b014372b6feb0ccc454a5171;hp=03892b60238b4a860a411256eb66c31cd0f68d5e;hpb=f5e1f6eed699e5d869dfebc1a3c168bbeea29147;p=ardour.git

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 03892b6023..9c67ebef86 100644
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -20,17 +20,18 @@
 #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>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -41,8 +42,7 @@ Pool Click::pool ("click", sizeof (Click), 1024);
 void
 Session::click (framepos_t start, framecnt_t nframes)
 {
-	TempoMap::BBTPointList::const_iterator points_begin;
-	TempoMap::BBTPointList::const_iterator points_end;
+	vector<TempoMap::BBTPoint> points;
 	Sample *buf;
 	framecnt_t click_distance;
 
@@ -50,14 +50,14 @@ Session::click (framepos_t start, framecnt_t nframes)
 		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 || ((click_distance + nframes) < _worst_track_latency)) {
+	if (!clickm.locked() || !_clicking || click_data == 0 || ((click_distance + nframes) < _worst_track_latency)) {
 		_click_io->silence (nframes);
 		return;
 	}
@@ -71,22 +71,24 @@ Session::click (framepos_t start, framecnt_t nframes)
 	BufferSet& bufs = get_scratch_buffers(ChanCount(DataType::AUDIO, 1));
 	buf = bufs.get_audio(0).data();
 
-	_tempo_map->get_grid (points_begin, points_end, start, end);
+	_tempo_map->get_grid (points, start, end);
 
-	if (distance (points_begin, points_end) == 0) {
+	if (distance (points.begin(), points.end()) == 0) {
 		goto run_clicks;
 	}
 
-	for (TempoMap::BBTPointList::const_iterator i = points_begin; i != points_end; ++i) {
+	for (vector<TempoMap::BBTPoint>::iterator i = points.begin(); i != points.end(); ++i) {
 		switch ((*i).beat) {
 		case 1:
-			if (click_emphasis_data) {
+			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;
 
 		default:
-			if (click_emphasis_data == 0 || (click_emphasis_data && (*i).beat != 1)) {
+			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;
@@ -131,6 +133,7 @@ Session::click (framepos_t start, framecnt_t nframes)
 		}
 	}
 
+	_click_gain->run (bufs, 0, 0, 1.0, nframes, false);
 	_click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
 }
 
@@ -223,7 +226,7 @@ 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;