leftmost_position => leftmost_sample, current_page_frames => current_page_samples

[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 afbfff224882f77925b6f80e1a3307692f58aa31..86577f44af3c657a4ef30c4584d6773aa1d28288 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -124,7 +124,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                break;
 
        case GDK_SCROLL_LEFT:
-               xdelta = (current_page_frames() / 8);
+               xdelta = (current_page_samples() / 8);
                if (leftmost_frame > xdelta) {
                        reset_x_origin (leftmost_frame - xdelta);
                } else {
@@ -133,11 +133,11 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                break;
 
        case GDK_SCROLL_RIGHT:
-               xdelta = (current_page_frames() / 8);
+               xdelta = (current_page_samples() / 8);
                if (max_framepos - xdelta > leftmost_frame) {
                        reset_x_origin (leftmost_frame + xdelta);
                } else {
-                       reset_x_origin (max_framepos - current_page_frames());
+                       reset_x_origin (max_framepos - current_page_samples());
                }
                break;
 
@@ -1003,8 +1003,6 @@ Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item)
 bool
 Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context, int x, int y, guint time)
 {
-       ArdourCanvas::Coord wx;
-       ArdourCanvas::Coord wy;
        boost::shared_ptr<Region> region;
        boost::shared_ptr<Region> region_copy;
        RouteTimeAxisView* rtav;
@@ -1018,15 +1016,13 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
                return false;
        }
 
-       _track_canvas_viewport->window_to_canvas (x, y, wx, wy);
-
        event.type = GDK_MOTION_NOTIFY;
-       event.button.x = wx;
-       event.button.y = wy;
+       event.button.x = x;
+       event.button.y = y;
        /* assume we're dragging with button 1 */
        event.motion.state = Gdk::BUTTON1_MASK;
 
-       (void) event_frame (&event, &px, &py);
+       (void) window_event_frame (&event, &px, &py);
 
        std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
        bool can_drop = false;
@@ -1096,8 +1092,6 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
                      const SelectionData& /*data*/,
                      guint /*info*/, guint /*time*/)
 {
-       double wx;
-       double wy;
        boost::shared_ptr<Region> region;
        boost::shared_ptr<Region> region_copy;
        RouteTimeAxisView* rtav;
@@ -1105,15 +1099,13 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
        double px;
        double py;
 
-       _track_canvas_viewport->window_to_canvas (x, y, wx, wy);
-
        event.type = GDK_MOTION_NOTIFY;
-       event.button.x = wx;
-       event.button.y = wy;
+       event.button.x = x;
+       event.button.y = y;
        /* assume we're dragging with button 1 */
        event.motion.state = Gdk::BUTTON1_MASK;
 
-       framepos_t const pos = event_frame (&event, &px, &py);
+       framepos_t const pos = window_event_frame (&event, &px, &py);
 
        std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);