add GUI elements to control 2in/2out panning. Probably not perfect. REQUIRES FULL...

[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 3ec82b3746f37d07729e62a855982f21b9678ade..5028f477894266a80ba1e534d0bcb4cc32b2c72b 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -61,7 +61,7 @@ using Gtkmm2ext::Keyboard;
 bool
 Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
-       nframes64_t xdelta;
+       framepos_t xdelta;
        int direction = ev->direction;
 
   retry:
@@ -127,10 +127,10 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 
        case GDK_SCROLL_RIGHT:
                xdelta = (current_page_frames() / 8);
-               if (max_frames - xdelta > leftmost_frame) {
+               if (max_framepos - xdelta > leftmost_frame) {
                        reset_x_origin (leftmost_frame + xdelta);
                } else {
-                       reset_x_origin (max_frames - current_page_frames());
+                       reset_x_origin (max_framepos - current_page_frames());
                }
                break;
 
@@ -294,7 +294,7 @@ Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, Rou
        case GDK_LEAVE_NOTIFY:
                set_entered_track (0);
                break;
-
+               
        default:
                break;
        }
@@ -518,6 +518,7 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
        case GDK_BUTTON_PRESS:
                clicked_crossfadeview = xfv;
                clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                if (event->button.button == 3) {
                        return button_press_handler (item, event, CrossfadeViewItem);
                }
@@ -772,13 +773,13 @@ Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, Re
           perspective. XXX change this ??
        */
 
-        ItemType type;
+       ItemType type;
 
-        if (item->get_data ("isleft")) {
-                type = LeftFrameHandle;
-        } else {
-                type = RightFrameHandle;
-        }
+       if (item->get_data ("isleft")) {
+               type = LeftFrameHandle;
+       } else {
+               type = RightFrameHandle;
+       }
 
        switch (event->type) {
        case GDK_BUTTON_PRESS:
@@ -838,7 +839,7 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
                break;
        case GDK_MOTION_NOTIFY:
                motion_handler (item, event);
-                ret = true; // force this to avoid progagating the event into the regionview
+               ret = true; // force this to avoid progagating the event into the regionview
                break;
        case GDK_ENTER_NOTIFY:
                set_entered_regionview (rv);
@@ -900,7 +901,7 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item
 }
 
 bool
-Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView *rv)
+Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView*)
 {
        bool ret = false;
 
@@ -1032,7 +1033,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/,
 
                double px;
                double py;
-               nframes64_t const pos = event_frame (&event, &px, &py);
+               framepos_t const pos = event_frame (&event, &px, &py);
 
                std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
                if (tv.first == 0) {