Make global port matrix a Gtk::Window rather than an ArdourDialog.

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 0ddbce2e97cbf64311fedf1157d01a364f6f0eaf..9bef055b57aec7e3e33d8c0f3b4c756fdd270969 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -102,12 +102,12 @@ Editor::tempo_map_changed (Change ignored)
 
        ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
 
-       compute_current_bbt_points(leftmost_frame, leftmost_frame + (nframes_t)(edit_packer.get_width() * frames_per_unit));
+       if (tempo_lines)
+               tempo_lines->tempo_map_changed();
+
+       compute_current_bbt_points(leftmost_frame, leftmost_frame + current_page_frames());
        session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
-       update_tempo_based_rulers ();
-       if (tempo_map_change_idle_handler_id  < 0) {
-                       tempo_map_change_idle_handler_id = Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
-       }
+       redraw_measures ();
 }
 
 void
@@ -117,23 +117,19 @@ Editor::redisplay_tempo (bool immediate_redraw)
                return;
        }
        
-       compute_current_bbt_points (leftmost_frame, leftmost_frame + (nframes_t)(edit_packer.get_width() * frames_per_unit)); // redraw rulers and measures
+       compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures
 
+       compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames());
        if (immediate_redraw) {
-
-               hide_measures ();
-
-               if (current_bbt_points) {
-                       draw_measures ();
-               }
-
-       } else if (tempo_map_change_idle_handler_id  < 0) {
-
-               tempo_map_change_idle_handler_id = Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
-
+               redraw_measures ();
+       } else {
+#ifdef GTKOSX
+               redraw_measures ();
+#else
+               Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
+#endif
        }
-
-       update_tempo_based_rulers ();
+       update_tempo_based_rulers (); // redraw rulers and measures
 }
 
 void
@@ -164,10 +160,8 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
        }
        next_beat.ticks = 0;
        
-       if (current_bbt_points) {
-               delete current_bbt_points;
-               current_bbt_points = 0;
-       }
+       delete current_bbt_points;
+       current_bbt_points = 0;
 
        current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1);
 }
@@ -182,9 +176,7 @@ Editor::hide_measures ()
 bool
 Editor::redraw_measures ()
 {
-       hide_measures ();
        draw_measures ();
-       tempo_map_change_idle_handler_id = -1;
        return false;
 }
 
@@ -196,12 +188,8 @@ Editor::draw_measures ()
                return;
        }
 
-       if (current_bbt_points == 0 || current_bbt_points->empty()) {
-               return;
-       }
-
        if (tempo_lines == 0) {
-               tempo_lines = new TempoLines(*track_canvas, time_line_group);
+               tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height);
        }
 
        tempo_lines->draw(*current_bbt_points, frames_per_unit);