X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_click.cc;h=872828e57ecf64df2e481f2f31865508d0dfa9ae;hb=c7ff67004a51ae3f0453531c3d64bd9876f1df3b;hp=62e13e8fc230fabd251ce8633d2a255fe423ac0d;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 62e13e8fc2..872828e57e 100644
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -42,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;
 
@@ -58,7 +57,7 @@ Session::click (framepos_t start, framecnt_t nframes)
 
 	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;
 	}
@@ -72,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;