diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-16 13:57:51 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-16 13:57:51 +0000 |
| commit | cd44c8241c868b47c11ea8a669e5c37484fee25f (patch) | |
| tree | 44fe6243c3e04fdfe983cb9a449bc4a09782888e /gtk2_ardour/editor_canvas_events.cc | |
| parent | 5f61efff8f4d80c9576fb8524f37cb8905ba51a8 (diff) | |
add GotoWallClock command; switch Editor class to use nframes64_t throughout; fix up some glitches in playhead/screen handling when locating ; never save keybindings to user's ~/.ardour2 dir unless the user changed them (well, nearly)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3361 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 4615fda5f4..a1ac41d47c 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -54,7 +54,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) { int x, y; double wx, wy; - nframes_t xdelta; + nframes64_t xdelta; int direction = ev->direction; retry: @@ -77,7 +77,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)) { @@ -112,7 +112,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)) { @@ -171,7 +171,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) { |