Use Session::session_directory to access the sound path of the session in Editor...

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 270ea38b2ecc370f8056f67a9839a955fc8860cb..c1cc2bb3a8e1879596ca0450a523b8f702514027 100644 (file)
--- 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 
@@ -44,6 +43,7 @@
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "color.h"
+#include "time_axis_view.h"
 
 #include "i18n.h"
 
@@ -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))));
                }
                
@@ -95,7 +95,26 @@ Editor::draw_metric_marks (const Metrics& metrics)
 void
 Editor::tempo_map_changed (Change ignored)
 {
-        ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
+       if (!session) {
+               return;
+       }
+
+       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
 
@@ -111,13 +130,13 @@ Editor::tempo_map_changed (Change ignored)
        previous_beat.ticks = 0;
 
        if (session->tempo_map().meter_at(leftmost_frame + current_page_frames()).beats_per_bar () > next_beat.beats + 1) {
-         next_beat.beats += 1;
+               next_beat.beats += 1;
        } else {
-         next_beat.bars += 1;
-         next_beat.beats = 1;
+               next_beat.bars += 1;
+               next_beat.beats = 1;
        }
        next_beat.ticks = 0;
-
+       
        if (current_bbt_points) {
                delete current_bbt_points;
                current_bbt_points = 0;
@@ -130,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 ();
+               }
        }
 }
 
@@ -157,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();
@@ -191,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()) {
@@ -200,6 +223,7 @@ Editor::draw_measures ()
        }
 
        track_canvas.get_scroll_region (x1, y1, x2, y2);
+       y2 = TimeAxisView::hLargest*5000; // five thousand largest tracks should be enough.. :)
 
        /* get the first bar spacing */
 
@@ -215,7 +239,7 @@ Editor::draw_measures ()
                 */
                return;
        }
-
+       
        for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
 
                switch ((*i).type) {
@@ -225,9 +249,9 @@ Editor::draw_measures ()
                case TempoMap::Beat:
                        
                        if ((*i).beat == 1) {
-                               color = color_map[cMeasureLineBeat];
+                               color = Config->canvasvar_MeasureLineBar.get();
                        } else {
-                               color = color_map[cMeasureLineBar];
+                               color = Config->canvasvar_MeasureLineBeat.get();
 
                                if (beat_density > 2.0) {
                                        /* only draw beat lines if the gaps between beats are large.
@@ -293,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
@@ -335,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
@@ -387,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
@@ -419,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
@@ -471,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;
 }
 
@@ -507,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;
 }