merge from 2.0-ongoing @ 3581

[ardour.git] / gtk2_ardour / editor_canvas_events.cc

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 0da0bfc4878290e700c6f3a56531cf4413803917..dd107d8d0280a2c571a51bb06e5fb865c9af96e9 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -56,7 +56,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
        int x, y;
        double wx, wy;
-       nframes_t xdelta;
+       nframes64_t xdelta;
        int direction = ev->direction;
        CanvasNoteEvent *midi_event = dynamic_cast<CanvasNoteEvent *>(track_canvas->get_item_at(ev->x, ev->y));
 
@@ -80,7 +80,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                        event.button.x = wx;
                        event.button.y = wy;
                        
-                       nframes_t where = event_frame (&event, 0, 0);
+                       nframes64_t where = event_frame (&event, 0, 0);
                        temporal_zoom_to_frame (false, where);
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
@@ -93,7 +93,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                                        return false;
                                }
                        }
-                       gettimeofday (&last_track_height_step_timestamp, 0);
+                       last_track_height_step_timestamp = get_microseconds();
                        current_stepping_trackview->step_height (true);
                        return true;
                } else {
@@ -118,7 +118,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                        event.button.x = wx;
                        event.button.y = wy;
                        
-                       nframes_t where = event_frame (&event, 0, 0);
+                       nframes64_t where = event_frame (&event, 0, 0);
                        temporal_zoom_to_frame (true, where);
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
@@ -131,7 +131,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                                        return false;
                                }
                        }
-                       gettimeofday (&last_track_height_step_timestamp, 0);
+                       last_track_height_step_timestamp = get_microseconds();
                        current_stepping_trackview->step_height (false);
                        return true;
                } else {
@@ -180,7 +180,7 @@ Editor::track_canvas_scroll_event (GdkEventScroll *event)
 bool
 Editor::time_canvas_scroll (GdkEventScroll* ev)
 {
-       nframes_t xdelta;
+       nframes64_t xdelta;
        int direction = ev->direction;
 
        switch (direction) {