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 591c3d12fe36725a2fe65036aacd51ec6e3fce0f..9bef055b57aec7e3e33d8c0f3b4c756fdd270969 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -44,6 +44,7 @@
 #include "gui_thread.h"
 #include "time_axis_view.h"
 #include "ardour_ui.h"
+#include "tempo_lines.h"
 
 #include "i18n.h"
 
@@ -99,14 +100,14 @@ 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));
 
-       compute_current_bbt_points(leftmost_frame, leftmost_frame + (nframes_t)(canvas_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
@@ -116,23 +117,19 @@ Editor::redisplay_tempo (bool immediate_redraw)
                return;
        }
        
-       compute_current_bbt_points (leftmost_frame, leftmost_frame + (nframes_t)(canvas_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
@@ -148,9 +145,9 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
        session->bbt_time(rightmost, next_beat);
 
        if (previous_beat.beats > 1) {
-               previous_beat.beats -= 1;
+               previous_beat.beats -= 1;
        } else if (previous_beat.bars > 1) {
-               previous_beat.bars--;
+               previous_beat.bars--;
                previous_beat.beats += 1;
        }
        previous_beat.ticks = 0;
@@ -163,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);
 }
@@ -174,43 +169,34 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
 void
 Editor::hide_measures ()
 {
-       tempo_lines->hide();
-       marker_tempo_lines->hide();
+       if (tempo_lines)
+               tempo_lines->hide();
 }
 
 bool
 Editor::redraw_measures ()
 {
-       hide_measures ();
        draw_measures ();
-       tempo_map_change_idle_handler_id = -1;
        return false;
 }
 
 void
 Editor::draw_measures ()
 {
-       if (session == 0 || _show_measures == false
-                       || !current_bbt_points || current_bbt_points->empty()) {
+       if (session == 0 || _show_measures == false || 
+           !current_bbt_points || current_bbt_points->empty()) {
                return;
        }
 
-       tempo_lines->draw(*current_bbt_points, frames_per_unit);
-       marker_tempo_lines->draw(*current_bbt_points, frames_per_unit);
-
-       /*time_line_group->raise_to_top();
-       time_line_group->lower(1);*/
-       marker_time_line_group->raise_to_top();
-       //marker_time_line_group->lower(1);
-
-       /* the cursors are always on top of everything */
-       cursor_group->raise_to_top();
+       if (tempo_lines == 0) {
+               tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height);
+       }
 
-       return;
+       tempo_lines->draw(*current_bbt_points, frames_per_unit);
 }
 
 void
-Editor::mouse_add_new_tempo_event (nframes_t frame)
+Editor::mouse_add_new_tempo_event (nframes64_t frame)
 {
        if (session == 0) {
                return;
@@ -252,7 +238,7 @@ Editor::mouse_add_new_tempo_event (nframes_t frame)
 }
 
 void
-Editor::mouse_add_new_meter_event (nframes_t frame)
+Editor::mouse_add_new_meter_event (nframes64_t frame)
 {
        if (session == 0) {
                return;
@@ -365,10 +351,14 @@ Editor::edit_tempo_section (TempoSection* section)
        tempo_dialog.get_bbt_time(when);
        bpm = max (0.01, bpm);
        
+       cerr << "Editing tempo section to be at " << when << endl;
+       session->tempo_map().dump (cerr);
        begin_reversible_command (_("replace tempo mark"));
         XMLNode &before = session->tempo_map().get_state();
        session->tempo_map().replace_tempo (*section, Tempo (bpm,nt));
+       session->tempo_map().dump (cerr);
        session->tempo_map().move_tempo (*section, when);
+       session->tempo_map().dump (cerr);
         XMLNode &after = session->tempo_map().get_state();
        session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
        commit_reversible_command ();