X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=7fe87596390436f0a73fae47b9f2216c672535ef;hb=cd9fdb935f08966cc8c7170a39870e8adcae69d8;hp=da856aa8a4855dbabd45b64b34c8a614ccc33cb0;hpb=d36c15fd45566e7cbf03003049dd43cdf21138c0;p=ardour.git

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index da856aa8a4..7fe8759639 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdio> // for sprintf, grrr 
@@ -100,7 +99,22 @@ Editor::tempo_map_changed (Change ignored)
 		return;
 	}
 
-        ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
+	ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
+	
+	redisplay_tempo (false); // redraw rulers and measures
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
+}
+
+/**
+ * This code was originally in tempo_map_changed, but this is called every time the canvas scrolls horizontally. 
+ * That's why this is moved in here. The new tempo_map_changed is called when the ARDOUR::TempoMap actually changed.
+ */
+void
+Editor::redisplay_tempo (bool immediate_redraw)
+{
+	if (!session) {
+		return;
+	}
 
 	BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
 
@@ -135,17 +149,21 @@ Editor::tempo_map_changed (Change ignored)
 		current_bbt_points = 0;
 	}
 
-	redisplay_tempo ();
-}
+	if (immediate_redraw) {
 
-void
-Editor::redisplay_tempo ()
-{	
+		hide_measures ();
+
+		if (session && current_bbt_points) {
+			draw_measures ();
+		}
 
-	if (session && current_bbt_points) {
-		Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures));
 	} else {
-		hide_measures ();
+
+		if (session && current_bbt_points) {
+			Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures));
+		} else {
+			hide_measures ();
+		}
 	}
 }
 
@@ -162,10 +180,10 @@ Editor::hide_measures ()
 ArdourCanvas::SimpleLine *
 Editor::get_time_line ()
 {
-         ArdourCanvas::SimpleLine *line;
+	ArdourCanvas::SimpleLine *line;
 
 	if (free_measure_lines.empty()) {
-	        line = new ArdourCanvas::SimpleLine (*time_line_group);
+		line = new ArdourCanvas::SimpleLine (*time_line_group);
 		used_measure_lines.push_back (line);
 	} else {
 		line = free_measure_lines.front();
@@ -196,8 +214,8 @@ Editor::draw_measures ()
 	gdouble xpos;
 	double x1, x2, y1, y2, beat_density;
 
-        uint32_t beats = 0;
-        uint32_t bars = 0;
+	uint32_t beats = 0;
+	uint32_t bars = 0;
 	uint32_t color;
 
 	if (current_bbt_points == 0 || current_bbt_points->empty()) {
@@ -221,7 +239,7 @@ Editor::draw_measures ()
 		 */
 		return;
 	}
-
+	
 	for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
 
 		switch ((*i).type) {
@@ -299,8 +317,6 @@ Editor::mouse_add_new_tempo_event (nframes_t frame)
 	commit_reversible_command ();
 	
 	map.dump (cerr);
-
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -341,8 +357,6 @@ Editor::mouse_add_new_meter_event (nframes_t frame)
 	commit_reversible_command ();
 	
 	map.dump (cerr);
-
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -393,8 +407,6 @@ Editor::edit_meter_section (MeterSection* section)
         XMLNode &after = session->tempo_map().get_state();
 	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
-
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -425,8 +437,6 @@ Editor::edit_tempo_section (TempoSection* section)
         XMLNode &after = session->tempo_map().get_state();
 	session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
-
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -477,8 +487,6 @@ Editor::real_remove_tempo_marker (TempoSection *section)
 	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-
 	return FALSE;
 }
 
@@ -513,7 +521,5 @@ Editor::real_remove_meter_marker (MeterSection *section)
 	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-
 	return FALSE;
 }