X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_lines.cc;h=bb86011458427b6a2004de2f352d5b0d14192e2c;hb=234b06a18cf3e8c07bc44fb4f8c1218e17fb65f1;hp=083b7a5cca8b4db2049dc4b784d6acf490cea4b0;hpb=7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a;p=ardour.git

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 083b7a5cca..bb86011458 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -17,52 +17,78 @@
 
 */
 
-#include "canvas/line.h"
+#include "pbd/compose.h"
+
 #include "canvas/canvas.h"
 #include "canvas/debug.h"
+
 #include "tempo_lines.h"
-#include "ardour_ui.h"
+#include "public_editor.h"
+#include "rgb_macros.h"
+#include "ui_config.h"
 
 using namespace std;
 
-TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double h)
-	: _canvas (canvas)
-	, _group (group)
-	, _height (h)
+TempoLines::TempoLines (ArdourCanvas::Container* group, double)
+	: lines (group, ArdourCanvas::LineSet::Vertical)
 {
+	lines.set_extent (ArdourCanvas::COORD_MAX);
 }
 
 void
 TempoLines::tempo_map_changed()
 {
-	/* remove all lines from the group, put them in the cache (to avoid
-	 * unnecessary object destruction+construction later), and clear _lines
-	 */
-	 
-	_group->clear ();
-	_cache.insert (_cache.end(), _lines.begin(), _lines.end());
-	_lines.clear ();
+	lines.clear ();
 }
 
 void
 TempoLines::show ()
 {
-	_group->show ();
+	lines.show ();
 }
 
 void
 TempoLines::hide ()
 {
-	_group->hide ();
+	lines.hide ();
+}
+
+void
+TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b,
+                        unsigned                                              divisions,
+                        framecnt_t                                            leftmost_frame,
+                        framecnt_t                                            frame_rate)
+{
+	const double   fpb  = b->tempo->frames_per_beat(frame_rate);
+	const uint32_t base = UIConfiguration::instance().color_mod("measure line beat", "measure line beat");
+
+	for (unsigned l = 1; l < divisions; ++l) {
+		/* find the coarsest division level this tick falls on */
+		unsigned level = divisions;
+		for (unsigned d = divisions; d >= 4; d /= 2) {
+			if (l % (divisions / d) == 0) {
+				level = d;
+			}
+		}
+
+		/* 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);
+		const framepos_t f = b->frame + (l * (fpb / (double)divisions));
+		if (f > leftmost_frame) {
+			lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c);
+		}
+	}
 }
 
 void
-TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, 
-		  const ARDOUR::TempoMap::BBTPointList::const_iterator& end, 
-		  double samples_per_pixel)
+TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+                  const ARDOUR::TempoMap::BBTPointList::const_iterator& end,
+                  unsigned                                              divisions,
+                  framecnt_t                                            leftmost_frame,
+                  framecnt_t                                            frame_rate)
 {
 	ARDOUR::TempoMap::BBTPointList::const_iterator i;
-	ArdourCanvas::Rect const visible = _canvas.visible_area ();
 	double  beat_density;
 
 	uint32_t beats = 0;
@@ -73,54 +99,50 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
 
 	i = end;
 	i--;
-	bars = (*i).bar - (*begin).bar; 
+	bars = (*i).bar - (*begin).bar;
 	beats = distance (begin, end) - bars;
 
-	beat_density = (beats * 10.0f) / visible.width ();
+	beat_density = (beats * 10.0f) / lines.canvas()->width();
 
-	if (beat_density > 4.0f) {
+	if (beat_density > 2.0f) {
 		/* if the lines are too close together, they become useless */
-		tempo_map_changed();
+		lines.clear ();
 		return;
 	}
 
-	tempo_map_changed ();
+	/* constrain divisions to a log2 factor to cap line density */
+	while (divisions > 3 && beat_density * divisions > 0.4) {
+		divisions /= 2;
+	}
+
+	lines.clear ();
+
+	if (beat_density <= 0.12 && begin != end && begin->frame > 0) {
+		/* draw subdivisions of the beat before the first visible beat line */
+		ARDOUR::TempoMap::BBTPointList::const_iterator prev = begin;
+		--prev;
+		draw_ticks(prev, divisions, leftmost_frame, frame_rate);
+	}
 
 	for (i = begin; i != end; ++i) {
 
 		if ((*i).is_bar()) {
-			color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBar();
+			color = UIConfiguration::instance().color ("measure line bar");
 		} else {
-			if (beat_density > 2.0) {
+			if (beat_density > 0.3) {
 				continue; /* only draw beat lines if the gaps between beats are large. */
 			}
-			color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBeat();
+			color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat");
 		}
 
-		ArdourCanvas::Coord xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel);
+		ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame);
 
-		ArdourCanvas::Line* line;
+		lines.add (xpos, 1.0, color);
 
-		if (!_cache.empty()) {
-			line = _cache.back ();
-			_cache.pop_back ();
-			line->reparent (_group);
-		} else {
-			line = new ArdourCanvas::Line (_group);
-			CANVAS_DEBUG_NAME (line, "tempo measure line");
-			line->set_ignore_events (true);
+		if (beat_density <= 0.12) {
+			/* draw subdivisions of this beat */
+			draw_ticks(i, divisions, leftmost_frame, frame_rate);
 		}
-
-		/* move to 0.5 offset to ensure single pixel lines (see Cairo
-		 * FAQ for info on why we do this).
-		 */
-
-		line->set_x0 (xpos + 0.5);
-		line->set_x1 (xpos + 0.5);
-		line->set_y0 (0.0);
-		line->set_y1 (_height);
-		line->set_outline_color (color);
-		line->show ();
 	}
 }