X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_lines.cc;h=97aa662c38549779db1a67b9c38880c81a0469c8;hb=848e75aaeaa04a81883ed30bcd04abd862f9d1fd;hp=1400b189fb50773e7eda1734dee69a2469160962;hpb=820acf23009586ef4fe9cfbbfd3eb2f840012634;p=ardour.git

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 1400b189fb..97aa662c38 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2007 Paul Davis 
+    Copyright (C) 2002-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 using namespace std;
 
 #define MAX_CACHED_LINES 128
-	
+
 TempoLines::TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height)
 	: _canvas(canvas)
 	, _group(group)
@@ -41,15 +41,16 @@ TempoLines::tempo_map_changed()
 	_clean_left = DBL_MAX;
 	_clean_right = 0.0;
 
-	size_t d = 1;
+	double_t d = 1.0;
 	// TODO: Dirty/slow, but 'needed' for zoom :(
-	for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++d) {
+	for (Lines::iterator i = _lines.begin(); i != _lines.end(); d += 1.0) {
 		Lines::iterator next = i;
 		++next;
-      	i->second->property_x1() = - d;
-      	i->second->property_x2() = - d;
+		i->second->property_x1() = - d;
+		i->second->property_x2() = - d;
+		ArdourCanvas::SimpleLine* f = i->second;
 		_lines.erase(i);
-		_lines.insert(make_pair(- d, i->second));
+		_lines.insert(make_pair(- d, f));
 		i = next;
 	}
 }
@@ -58,7 +59,7 @@ void
 TempoLines::show ()
 {
 	for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
-      	i->second->show();
+		i->second->show();
 	}
 }
 
@@ -66,14 +67,16 @@ void
 TempoLines::hide ()
 {
 	for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
-      	i->second->hide();
+		i->second->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, 
+		  double frames_per_unit)
 {
-	ARDOUR::TempoMap::BBTPointList::iterator i;
+	ARDOUR::TempoMap::BBTPointList::const_iterator i;
 	ArdourCanvas::SimpleLine *line = NULL;
 	gdouble xpos;
 	double who_cares;
@@ -82,17 +85,17 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
 	uint32_t beats = 0;
 	uint32_t bars = 0;
 	uint32_t color;
-	
-	const size_t needed = points.size();
+
+	const size_t needed = distance (begin, end);
 
 	_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 ();
 
@@ -102,12 +105,12 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
 		return;
 	}
 
-	xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
+	xpos = rint(((framepos_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);
+	i = begin;
+
+	xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
 	const double needed_left = xpos;
 
 	Lines::iterator left = _lines.lower_bound(xpos); // first line >= xpos
@@ -116,108 +119,97 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
 	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;
+		// cout << endl << "*** LINE CACHE PERFECT HIT" << endl;
 		return;
 	}
 
 	//cout << endl << "*** LINE CACHE MISS" << endl;
 
-	bool inserted_last_time = true;
 	bool invalidated = false;
-	
-	for (i = points.begin(); i != points.end(); ++i) {
 
-		switch ((*i).type) {
-		case ARDOUR::TempoMap::Bar:
-			break;
+	for (i = begin; i != end; ++i) {
 
-		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()->canvasvar_MeasureLineBar.get();
+		} else {
+			if (beat_density > 2.0) {
+				continue; /* only draw beat lines if the gaps between beats are large. */
 			}
-			
-			xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
+			color = ARDOUR_UI::config()->canvasvar_MeasureLineBeat.get();
+		}
 
-			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;
+		xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
 
-			exhausted = (next == _lines.end());
-			
-			// Hooray, line is perfect			
-			if (line && line->property_x1() == xpos) {
-				if (li != _lines.end())
-					++li;
+		li = _lines.lower_bound(xpos); // first line >= xpos
 
-				line->property_color_rgba() = color;
-				inserted_last_time = false; // don't search next time
+		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;
 			// Use existing line, moving if necessary
-			} else if (!exhausted) {
-				Lines::iterator steal = _lines.end();
-				--steal;
+		} 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;
+				double const x = steal->first;
+				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));
+				invalidated = true;
+				
+				// Shift clean range left
+				_clean_left = min(_clean_left, xpos);
+				_clean_right = min(_clean_right, x);
 				
-				// 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);
+				// 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;
+				} 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;
-					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());
+		} else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {
+			//cout << "*** CREATING LINE" << endl;
+			/* if we already have a line there ... don't sweat it */
+			if (_lines.find (xpos) == _lines.end()) {
 				line = new ArdourCanvas::SimpleLine (*_group);
 				line->property_x1() = xpos;
 				line->property_x2() = xpos;
@@ -225,28 +217,26 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
 				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());
+		} else {
+			//cout << "*** STEALING FROM LEFT" << endl;
+			if (_lines.find (xpos) == _lines.end()) {
 				Lines::iterator steal = _lines.begin();
+				double const x = steal->first;
 				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;
-				
+			
 				// Shift clean range right
-				_clean_left = max(_clean_left, steal->first);
+				_clean_left = max(_clean_left, x);
 				_clean_right = max(_clean_right, xpos);
 			}
-
-			break;
 		}
 	}