Make global static children variable an xml node object variable.

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 8bb19e358be1b3f47bcfb6bf8633f66ef24e4a96..7896b217dc7a2a994c21566b0b2919090e49325f 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -222,7 +222,7 @@ Editor::draw_measures ()
                return;
        }
 
-       track_canvas.get_scroll_region (x1, y1, x2, y2);
+       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 */
@@ -232,7 +232,7 @@ Editor::draw_measures ()
        bars = (*i).bar - (*current_bbt_points->begin()).bar;
        beats = current_bbt_points->size() - bars;
 
-       beat_density =  (beats * 10.0f) / track_canvas.get_width ();
+       beat_density =  (beats * 10.0f) / track_canvas->get_width ();
 
        if (beat_density > 4.0f) {
                /* if the lines are too close together, they become useless
@@ -260,7 +260,7 @@ Editor::draw_measures ()
                                }
                        }
 
-                       xpos = frame_to_unit ((*i).frame);
+                       xpos = frame_to_unit ((nframes64_t) (*i).frame);
                        line = get_time_line ();
                        line->property_x1() = xpos;
                        line->property_x2() = xpos;
@@ -283,7 +283,7 @@ Editor::draw_measures ()
 }
 
 void
-Editor::mouse_add_new_tempo_event (nframes_t frame)
+Editor::mouse_add_new_tempo_event (nframes64_t frame)
 {
        if (session == 0) {
                return;
@@ -325,7 +325,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;