diff options
| author | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
| commit | fedf3d34f32264ac57c6a222b678dc90f2bb1a88 (patch) | |
| tree | e816c676d12ccc32b7e666792b9a01ab5b5a0367 /gtk2_ardour/editor_canvas_events.cc | |
| parent | 7bd41538d951c3e476655df741adfbebbb990bde (diff) | |
Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again).
git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 58f9deebbd..249a65ae01 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -70,7 +70,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) event.button.x = wx; event.button.y = wy; - jack_nframes_t where = event_frame (&event, 0, 0); + nframes_t where = event_frame (&event, 0, 0); temporal_zoom_to_frame (true, where); return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) { @@ -101,7 +101,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) event.button.x = wx; event.button.y = wy; - jack_nframes_t where = event_frame (&event, 0, 0); + nframes_t where = event_frame (&event, 0, 0); temporal_zoom_to_frame (false, where); return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) { |