Merged with trunk R992.

[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 58f9deebbdddac44c3a8be54164a3da551860c4d..249a65ae0180a3aeba040b78ba85ef886156cc42 100644 (file)
--- 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)) {