diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
| commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
| tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /gtk2_ardour/editor_canvas_events.cc | |
| parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) | |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 0da0bfc487..dd107d8d02 100644 --- 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) { |