Major Theme Manager changes, see ardour-dev

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index ae2bda903e8f38342077c0d39927f65e1ccb1a56..c1cc2bb3a8e1879596ca0450a523b8f702514027 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -70,7 +70,7 @@ void
 Editor::draw_metric_marks (const Metrics& metrics)
 {
 
-        const MeterSection *ms;
+       const MeterSection *ms;
        const TempoSection *ts;
        char buf[64];
        
@@ -80,11 +80,11 @@ Editor::draw_metric_marks (const Metrics& metrics)
                
                if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
                        snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
-                       metric_marks.push_back (new MeterMarker (*this, *meter_group, color_map[cMeterMarker], buf, 
+                       metric_marks.push_back (new MeterMarker (*this, *meter_group, Config->canvasvar_MeterMarker.get(), buf, 
                                                                 *(const_cast<MeterSection*>(ms))));
                } else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
                        snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
-                       metric_marks.push_back (new TempoMarker (*this, *tempo_group, color_map[cTempoMarker], buf, 
+                       metric_marks.push_back (new TempoMarker (*this, *tempo_group, Config->canvasvar_TempoMarker.get(), buf, 
                                                                 *(const_cast<TempoSection*>(ts))));
                }
                
@@ -93,13 +93,28 @@ Editor::draw_metric_marks (const Metrics& metrics)
 }
 
 void
-Editor::tempo_map_changed (Change ignored, bool immediate_redraw)
+Editor::tempo_map_changed (Change ignored)
 {
        if (!session) {
                return;
        }
 
-        ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored, immediate_redraw));
+       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
 
@@ -152,11 +167,6 @@ Editor::tempo_map_changed (Change ignored, bool immediate_redraw)
        }
 }
 
-void
-Editor::redisplay_tempo ()
-{      
-}
-
 void
 Editor::hide_measures ()
 {
@@ -239,9 +249,9 @@ Editor::draw_measures ()
                case TempoMap::Beat:
                        
                        if ((*i).beat == 1) {
-                               color = color_map[cMeasureLineBar];
+                               color = Config->canvasvar_MeasureLineBar.get();
                        } else {
-                               color = color_map[cMeasureLineBeat];
+                               color = Config->canvasvar_MeasureLineBeat.get();
 
                                if (beat_density > 2.0) {
                                        /* only draw beat lines if the gaps between beats are large.
@@ -307,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
@@ -349,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
@@ -401,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
@@ -433,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
@@ -485,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;
 }
 
@@ -521,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;
 }