check master sources when determining whether a region uses a source. should fix...

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 25fb5acbe76a298005be230989334e9ff9441468..488b804d654f97fcef25e5cd5633b0c9bfa8b814 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -114,10 +114,13 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/)
                tempo_lines->tempo_map_changed();
        }
 
-       compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames());
+       ARDOUR::TempoMap::BBTPointList::const_iterator begin;
+       ARDOUR::TempoMap::BBTPointList::const_iterator end;
+
+       compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames(), begin, end);
        _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
        redraw_measures ();
-       update_tempo_based_rulers ();
+       update_tempo_based_rulers (begin, end);
 }
 
 void
@@ -127,7 +130,11 @@ Editor::redisplay_tempo (bool immediate_redraw)
                return;
        }
 
-       compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures
+       ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_begin;
+       ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_end;
+
+       compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames(),
+                                   current_bbt_points_begin, current_bbt_points_end);
 
        if (immediate_redraw) {
                redraw_measures ();
@@ -138,38 +145,22 @@ Editor::redisplay_tempo (bool immediate_redraw)
                Glib::signal_idle().connect (sigc::mem_fun (*this, &Editor::redraw_measures));
 #endif
        }
-       update_tempo_based_rulers (); // redraw rulers and measures
+       update_tempo_based_rulers (current_bbt_points_begin, current_bbt_points_end); // redraw rulers and measures
 }
 
 void
-Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost)
+Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost,
+                                   ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+                                   ARDOUR::TempoMap::BBTPointList::const_iterator& end)
 {
        if (!_session) {
                return;
        }
 
-       Timecode::BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
+       /* prevent negative values of leftmost from creeping into tempomap
+        */
 
-       _session->bbt_time(leftmost, previous_beat);
-       _session->bbt_time(rightmost, next_beat);
-
-       if (previous_beat.beats > 1) {
-               previous_beat.beats -= 1;
-       } else if (previous_beat.bars > 1) {
-               previous_beat.bars--;
-               previous_beat.beats += 1;
-       }
-       previous_beat.ticks = 0;
-
-       if (_session->tempo_map().meter_at(rightmost).divisions_per_bar () > next_beat.beats + 1) {
-               next_beat.beats += 1;
-       } else {
-               next_beat.bars += 1;
-               next_beat.beats = 1;
-       }
-       next_beat.ticks = 0;
-
-       _session->tempo_map().map (current_bbt_points_begin, current_bbt_points_end, _session->tempo_map().frame_time (previous_beat), _session->tempo_map().frame_time (next_beat) + 1);
+       _session->tempo_map().get_grid (begin, end, max (leftmost, (framepos_t) 0), rightmost);
 }
 
 void
@@ -182,14 +173,20 @@ Editor::hide_measures ()
 bool
 Editor::redraw_measures ()
 {
-       draw_measures ();
+       ARDOUR::TempoMap::BBTPointList::const_iterator begin;
+       ARDOUR::TempoMap::BBTPointList::const_iterator end;
+
+       compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames(), begin, end);
+        draw_measures (begin, end);
+
        return false;
 }
 
 void
-Editor::draw_measures ()
+Editor::draw_measures (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+                      ARDOUR::TempoMap::BBTPointList::const_iterator& end)
 {
-       if (_session == 0 || _show_measures == false || distance (current_bbt_points_begin, current_bbt_points_end) == 0) {
+       if (_session == 0 || _show_measures == false || distance (begin, end) == 0) {
                return;
        }
 
@@ -197,7 +194,7 @@ Editor::draw_measures ()
                tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height(get_window()));
        }
 
-       tempo_lines->draw (current_bbt_points_begin, current_bbt_points_end, frames_per_unit);
+       tempo_lines->draw (begin, end, frames_per_unit);
 }
 
 void
@@ -210,7 +207,6 @@ Editor::mouse_add_new_tempo_event (framepos_t frame)
        TempoMap& map(_session->tempo_map());
        TempoDialog tempo_dialog (map, frame, _("add"));
 
-       tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
        //this causes compiz to display no border.
        //tempo_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
 
@@ -253,8 +249,6 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
        TempoMap& map(_session->tempo_map());
        MeterDialog meter_dialog (map, frame, _("add"));
 
-       meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
        //this causes compiz to display no border..
        //meter_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
 
@@ -310,8 +304,6 @@ Editor::edit_meter_section (MeterSection* section)
 {
        MeterDialog meter_dialog (*section, _("done"));
 
-       meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
        ensure_float (meter_dialog);
 
        switch (meter_dialog.run()) {
@@ -342,8 +334,6 @@ Editor::edit_tempo_section (TempoSection* section)
 {
        TempoDialog tempo_dialog (*section, _("done"));
 
-       tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
        ensure_float (tempo_dialog);
 
        switch (tempo_dialog.run ()) {