X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Ftempo_lines.cc;h=828a4cc82ba8a390af7b320bfcf37d4c8663319b;hb=e36f74e071d4c14862d23da5ff0d49df0940d536;hp=aa8b48fc2b2e856b145591b5a7488e318228a742;hpb=046f8026628a52adeb6983948e39b2665f4c0b49;p=ardour.git

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index aa8b48fc2b..828a4cc82b 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -17,84 +17,69 @@
 
 */
 
-#include <libgnomecanvasmm/canvas.h>
-#include <libgnomecanvasmm/group.h>
+#include "pbd/compose.h"
+
+#include "canvas/line.h"
+#include "canvas/canvas.h"
+#include "canvas/debug.h"
+
 #include "tempo_lines.h"
 #include "ardour_ui.h"
+#include "public_editor.h"
 
 using namespace std;
 
-#define MAX_CACHED_LINES 128
-
-TempoLines::TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height)
-	: _canvas(canvas)
-	, _group(group)
-	, _clean_left(DBL_MAX)
-	, _clean_right(0.0)
-	, _height(screen_height)
+TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double h)
+	: _canvas (canvas)
+	, _group (group)
+	, _height (h)
 {
 }
 
 void
 TempoLines::tempo_map_changed()
 {
-	_clean_left = DBL_MAX;
-	_clean_right = 0.0;
-
-	size_t d = 1;
-	// TODO: Dirty/slow, but 'needed' for zoom :(
-	for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++d) {
-		Lines::iterator next = i;
-		++next;
-		i->second->property_x1() = - d;
-		i->second->property_x2() = - d;
-		_lines.erase(i);
-		_lines.insert(make_pair(- d, i->second));
-		i = next;
-	}
+	/* 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 ();
 }
 
 void
 TempoLines::show ()
 {
-	for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
-		i->second->show();
-	}
+	_group->show ();
 }
 
 void
 TempoLines::hide ()
 {
-	for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
-		i->second->hide();
-	}
+	_group->hide ();
 }
 
 void
-TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit)
+TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, 
+		  const ARDOUR::TempoMap::BBTPointList::const_iterator& end)
 {
-	ARDOUR::TempoMap::BBTPointList::iterator i;
-	ArdourCanvas::SimpleLine *line = NULL;
-	gdouble xpos;
-	double who_cares;
-	double x1, x2, y1, beat_density;
+	ARDOUR::TempoMap::BBTPointList::const_iterator i;
+	ArdourCanvas::Rect const visible = _canvas.visible_area ();
+	double  beat_density;
 
 	uint32_t beats = 0;
 	uint32_t bars = 0;
 	uint32_t color;
 
-	const size_t needed = points.size();
-
-	_canvas.get_scroll_region (x1, y1, x2, who_cares);
-
 	/* get the first bar spacing */
 
-	i = points.end();
+	i = end;
 	i--;
-	bars = (*i).bar - (*points.begin()).bar;
-	beats = points.size() - bars;
+	bars = (*i).bar - (*begin).bar; 
+	beats = distance (begin, end) - bars;
 
-	beat_density = (beats * 10.0f) / _canvas.get_width ();
+	beat_density = (beats * 10.0f) / visible.width ();
 
 	if (beat_density > 4.0f) {
 		/* if the lines are too close together, they become useless */
@@ -102,158 +87,39 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
 		return;
 	}
 
-	xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
-	const double needed_right = xpos;
-
-	i = points.begin();
-
-	xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
-	const double needed_left = xpos;
-
-	Lines::iterator left = _lines.lower_bound(xpos); // first line >= xpos
-
-	bool exhausted = (left == _lines.end());
-	Lines::iterator li = left;
-	if (li != _lines.end())
-		line = li->second;
-
-	// Tempo map hasn't changed and we're entirely within a clean
-	// range, don't need to do anything.  Yay.
-	if (needed_left >= _clean_left && needed_right <= _clean_right) {
-		//cout << endl << "*** LINE CACHE PERFECT HIT" << endl;
-		return;
-	}
-
-	//cout << endl << "*** LINE CACHE MISS" << endl;
-
-	bool inserted_last_time = true;
-	bool invalidated = false;
+	tempo_map_changed ();
 
-	for (i = points.begin(); i != points.end(); ++i) {
+	for (i = begin; i != end; ++i) {
 
-		switch ((*i).type) {
-		case ARDOUR::TempoMap::Bar:
-			break;
-
-		case ARDOUR::TempoMap::Beat:
-			if ((*i).beat == 1) {
-				color = ARDOUR_UI::config()->canvasvar_MeasureLineBar.get();
-			} else {
-				color = ARDOUR_UI::config()->canvasvar_MeasureLineBeat.get();
-				if (beat_density > 2.0) {
-					break; /* only draw beat lines if the gaps between beats are large. */
-				}
+		if ((*i).is_bar()) {
+			color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBar();
+		} else {
+			if (beat_density > 2.0) {
+				continue; /* only draw beat lines if the gaps between beats are large. */
 			}
+			color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBeat();
+		}
 
-			xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
-
-			if (inserted_last_time && !_lines.empty()) {
-				li = _lines.lower_bound(xpos); // first line >= xpos
-			}
-
-			line = (li != _lines.end()) ? li->second : NULL;
-			assert(!line || line->property_x1() == li->first);
-
-			Lines::iterator next = li;
-			if (next != _lines.end())
-				++next;
-
-			exhausted = (next == _lines.end());
-
-			// Hooray, line is perfect
-			if (line && line->property_x1() == xpos) {
-				if (li != _lines.end())
-					++li;
-
-				line->property_color_rgba() = color;
-				inserted_last_time = false; // don't search next time
-
-			// Use existing line, moving if necessary
-			} else if (!exhausted) {
-				Lines::iterator steal = _lines.end();
-				--steal;
-
-				// Steal from the right
-				if (left->first > needed_left && li != steal && steal->first > needed_right) {
-					//cout << "*** STEALING FROM RIGHT" << endl;
-					line = steal->second;
-					_lines.erase(steal);
-					line->property_x1() = xpos;
-					line->property_x2() = xpos;
-					line->property_color_rgba() = color;
-					_lines.insert(make_pair(xpos, line));
-					inserted_last_time = true; // search next time
-					invalidated = true;
-
-					// Shift clean range left
-					_clean_left = min(_clean_left, xpos);
-					_clean_right = min(_clean_right, steal->first);
-
-				// Move this line to where we need it
-				} else {
-					Lines::iterator existing = _lines.find(xpos);
-					if (existing != _lines.end()) {
-						//cout << "*** EXISTING LINE" << endl;
-						li = existing;
-						li->second->property_color_rgba() = color;
-						inserted_last_time = false; // don't search next time
-					} else {
-						//cout << "*** MOVING LINE" << endl;
-						const double x1 = line->property_x1();
-						const bool was_clean = x1 >= _clean_left && x1 <= _clean_right;
-						invalidated = invalidated || was_clean;
-						// Invalidate clean portion (XXX: too harsh?)
-						_clean_left  = needed_left;
-						_clean_right = needed_right;
-						_lines.erase(li);
-						line->property_color_rgba() = color;
-						line->property_x1() = xpos;
-						line->property_x2() = xpos;
-						_lines.insert(make_pair(xpos, line));
-						inserted_last_time = true; // search next time
-					}
-				}
-
-			// Create a new line
-			} else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {
-				//cout << "*** CREATING LINE" << endl;
-				assert(_lines.find(xpos) == _lines.end());
-				line = new ArdourCanvas::SimpleLine (*_group);
-				line->property_x1() = xpos;
-				line->property_x2() = xpos;
-				line->property_y1() = 0.0;
-				line->property_y2() = _height;
-				line->property_color_rgba() = color;
-				_lines.insert(make_pair(xpos, line));
-				inserted_last_time = true;
-
-			// Steal from the left
-			} else {
-				//cout << "*** STEALING FROM LEFT" << endl;
-				assert(_lines.find(xpos) == _lines.end());
-				Lines::iterator steal = _lines.begin();
-				line = steal->second;
-				_lines.erase(steal);
-				line->property_color_rgba() = color;
-				line->property_x1() = xpos;
-				line->property_x2() = xpos;
-				_lines.insert(make_pair(xpos, line));
-				inserted_last_time = true; // search next time
-				invalidated = true;
+		ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame);
 
-				// Shift clean range right
-				_clean_left = max(_clean_left, steal->first);
-				_clean_right = max(_clean_right, xpos);
-			}
+		ArdourCanvas::Line* line;
 
-			break;
+		if (!_cache.empty()) {
+			line = _cache.back ();
+			_cache.pop_back ();
+			line->reparent (_group);
+		} else {
+			line = new ArdourCanvas::Line (_group);
+			CANVAS_DEBUG_NAME (line, string_compose ("tempo measure line @ %1", (*i).frame));
+			line->set_ignore_events (true);
 		}
-	}
 
-	// Extend range to what we've 'fixed'
-	if (!invalidated) {
-		_clean_left  = min(_clean_left, needed_left);
-		_clean_right = max(_clean_right, needed_right);
+		line->set_x0 (xpos);
+		line->set_x1 (xpos);
+		line->set_y0 (0.0);
+		line->set_y1 (_height);
+		line->set_outline_color (color);
+		line->show ();
 	}
 }