X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_lines.cc;h=8d1d183d3a8a6be6d9b2d33052da97b0e76f360d;hb=b976bf8986290e8f4812a50e7fdd98b9cbeb4249;hp=508ae84ed9e55231ba6f307ba5737d99d0591ca7;hpb=715b17813026c6baf8a4adb4442c8586e114452c;p=ardour.git

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 508ae84ed9..8d1d183d3a 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -29,16 +29,24 @@
 
 using namespace std;
 
-TempoLines::TempoLines (ArdourCanvas::Container* group, double)
+TempoLines::TempoLines (ArdourCanvas::Container* group, double, ARDOUR::BeatsFramesConverter* bfc)
 	: lines (group, ArdourCanvas::LineSet::Vertical)
+	, _bfc (bfc)
 {
 	lines.set_extent (ArdourCanvas::COORD_MAX);
 }
 
+TempoLines::~TempoLines ()
+{
+	delete _bfc;
+	_bfc = 0;
+}
+
 void
-TempoLines::tempo_map_changed()
+TempoLines::tempo_map_changed (framepos_t new_origin)
 {
 	lines.clear ();
+	_bfc->set_origin_b (new_origin);
 }
 
 void
@@ -72,20 +80,8 @@ TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
 		/* draw line with alpha corresponding to coarsest level */
 		const uint8_t    a = max(8, (int)rint(UINT_RGBA_A(base) / (0.8 * log2(level))));
 		const uint32_t   c = UINT_RGBA_CHANGE_A(base, a);
-		framepos_t f = 0;
-
-		if (grid.begin()->c != 0.0) {
-			const double beat_divisions = (l / ((double) divisions)) * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor());
-			const double time_at_division = log (((grid.begin()->c * (beat_divisions)) /
-							   grid.begin()->tempo.beats_per_minute()) + 1) / grid.begin()->c;
+		const framepos_t f = _bfc->to (Evoral::Beats (grid.begin()->qn + (l / (double) divisions))) + _bfc->origin_b();
 
-			f = grid.begin()->frame + (framecnt_t) floor ((time_at_division * 60.0 * frame_rate) + 0.5);
-		} else {
-			const double fpb  = grid.begin()->tempo.frames_per_beat (frame_rate)
-				* (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor());
-
-			f = grid.begin()->frame + (l * (fpb / (double) divisions));
-		}
 		if (f > leftmost_frame) {
 			lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c);
 		}
@@ -103,20 +99,33 @@ TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
 
 	uint32_t beats = 0;
 	uint32_t bars = 0;
+	const uint32_t bar_color = UIConfiguration::instance().color ("measure line bar");
+	const uint32_t beat_color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat");
 	uint32_t color;
 
+	bool all_bars = false;
 	/* get the first bar spacing */
 
 	i = grid.end();
 	i--;
 	bars = (*i).bar - (*grid.begin()).bar;
 
+	int32_t bar_mod = 4;
+
 	if (bars < distance (grid.begin(), grid.end()) - 1) {
 		/* grid contains beats and bars */
 		beats = distance (grid.begin(), grid.end()) - bars;
 	} else {
 		/* grid contains only bars */
 		beats = distance (grid.begin(), grid.end());
+
+		if (i != grid.begin()) {
+			const int32_t last_bar = (*i).bar;
+			i--;
+			bar_mod = (last_bar - (*i).bar) * 4;
+		}
+
+		all_bars = true;
 	}
 
 	double canvas_width_used = 1.0;
@@ -139,7 +148,7 @@ TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
 	}
 
 	lines.clear ();
-	if (beat_density <= 0.12 && grid.begin() != grid.end() && grid.begin()->frame > 0) {
+	if (beat_density <= 0.12 && grid.begin() != grid.end() && grid.begin()->frame > 0 && !all_bars) {
 		/* draw subdivisions of the beat before the first visible beat line XX this shouldn't happen now */
 		std::vector<ARDOUR::TempoMap::BBTPoint> vec;
 		vec.push_back (*i);
@@ -149,19 +158,24 @@ TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
 	for (i = grid.begin(); i != grid.end(); ++i) {
 
 		if ((*i).is_bar()) {
-			color = UIConfiguration::instance().color ("measure line bar");
+			/* keep all_bar beat density down */
+			if (all_bars && beat_density > 0.3 && ((*i).bar % bar_mod) != 1) {
+				continue;
+			}
+
+			color = bar_color;
 		} else {
 			if (beat_density > 0.3) {
 				continue; /* only draw beat lines if the gaps between beats are large. */
 			}
-			color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat");
+			color = beat_color;
 		}
 
 		ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame);
 
 		lines.add (xpos, 1.0, color);
 
-		if (beat_density <= 0.12) {
+		if (beat_density <= 0.12 && !all_bars) {
 			/* draw subdivisions of this beat */
 			std::vector<ARDOUR::TempoMap::BBTPoint> vec;
 			vec.push_back (*i);