merged with trunk revs 2605-2627

[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 4b46ba72905d617345b8663d001a76eea81de035..ef11f546ef252e19e736f5030b87e5e6540eaea9 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cmath>
 
+#include <pbd/stacktrace.h>
+
 #include <ardour/audio_diskstream.h>
 #include <ardour/audioplaylist.h>
 
@@ -31,10 +33,10 @@
 #include "crossfade_view.h"
 #include "audio_time_axis.h"
 #include "region_gain_line.h"
-#include "automation_gain_line.h"
-#include "automation_pan_line.h"
+#include "automation_line.h"
 #include "automation_time_axis.h"
-#include "redirect_automation_line.h"
+#include "automation_line.h"
+#include "control_point.h"
 #include "canvas_impl.h"
 #include "simplerect.h"
 
@@ -129,39 +131,35 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 }
 
 bool
-Editor::track_canvas_event (GdkEvent *event, ArdourCanvas::Item* item)
+Editor::track_canvas_scroll_event (GdkEventScroll *event)
 {
-       gint x, y;
-
-       /* this is the handler for events that are not handled by
-          items.
-       */
-
-       switch (event->type) {
-       case GDK_MOTION_NOTIFY:
-               /* keep those motion events coming */
-               track_canvas.get_pointer (x, y);
-               return track_canvas_motion (event);
-
-       case GDK_BUTTON_PRESS:
-               track_canvas.grab_focus();
-               break;
-
-       case GDK_BUTTON_RELEASE:
-               if (drag_info.item) {
-                       end_grab (drag_info.item, event);
-               }
-               break;
+       track_canvas.grab_focus();
+       track_canvas_scroll (event);
+       return false;
+}
 
-       case GDK_SCROLL:
-               track_canvas.grab_focus();
-               track_canvas_scroll (&event->scroll);
-               break;
+bool
+Editor::track_canvas_button_press_event (GdkEventButton *event)
+{
+       track_canvas.grab_focus();
+       return false;
+}
 
-       default:
-               break;
+bool
+Editor::track_canvas_button_release_event (GdkEventButton *event)
+{
+       if (drag_info.item) {
+               end_grab (drag_info.item, (GdkEvent*) event);
        }
+       return false;
+}
 
+bool
+Editor::track_canvas_motion_notify_event (GdkEventMotion *event)
+{
+       int x, y;
+       /* keep those motion events coming */
+       track_canvas.get_pointer (x, y);
        return false;
 }
 
@@ -204,7 +202,6 @@ Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type)
        default:
                break;
        }
-                       
        return ret;
 }
 
@@ -224,8 +221,8 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg
        case GDK_3BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, RegionItem);
                break;
 
@@ -263,8 +260,8 @@ Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, Rou
        case GDK_3BUTTON_PRESS:
                clicked_regionview = 0;
                clicked_control_point = 0;
-               clicked_trackview = tv;
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(tv);
+               clicked_axisview = tv;
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(tv);
                ret = button_press_handler (item, event, StreamItem);
                break;
 
@@ -292,6 +289,7 @@ bool
 Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationTimeAxisView *atv)
 {
        bool ret = false;
+
        
        switch (event->type) {
        case GDK_BUTTON_PRESS:
@@ -299,8 +297,8 @@ Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item
        case GDK_3BUTTON_PRESS:
                clicked_regionview = 0;
                clicked_control_point = 0;
-               clicked_trackview = atv;
-               clicked_audio_trackview = 0;
+               clicked_axisview = atv;
+               clicked_routeview = 0;
                ret = button_press_handler (item, event, AutomationTrackItem);
                break;
 
@@ -340,8 +338,8 @@ Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRe
        case GDK_BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                if (event->button.button == 3) {
                        return button_press_handler (item, event, FadeInItem);
                }
@@ -378,8 +376,8 @@ Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
        case GDK_3BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, FadeInHandleItem);
                break;
 
@@ -419,8 +417,8 @@ Editor::canvas_fade_out_event (GdkEvent *event, ArdourCanvas::Item* item, AudioR
        case GDK_BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                if (event->button.button == 3) {
                        return button_press_handler (item, event, FadeOutItem);
                }
@@ -457,8 +455,8 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
        case GDK_3BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, FadeOutHandleItem);
                break;
 
@@ -499,7 +497,7 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
        switch (event->type) {
        case GDK_BUTTON_PRESS:
                clicked_crossfadeview = xfv;
-               clicked_trackview = &clicked_crossfadeview->get_time_axis_view();
+               clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
                if (event->button.button == 3) {
                        return button_press_handler (item, event, CrossfadeViewItem);
                } 
@@ -553,6 +551,8 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
                                        
                                        return canvas_region_view_event (event, rv->get_canvas_group(), rv);
                                } 
+
+                               delete rl;
                        }
                }
        }
@@ -563,15 +563,13 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 bool
 Editor::canvas_control_point_event (GdkEvent *event, ArdourCanvas::Item* item, ControlPoint* cp)
 {
-       ItemType type;
-
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
        case GDK_3BUTTON_PRESS:
                clicked_control_point = cp;
-               clicked_trackview = &cp->line.trackview;
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &cp->line().trackview;
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                clicked_regionview = 0;
                break;
 
@@ -585,19 +583,7 @@ Editor::canvas_control_point_event (GdkEvent *event, ArdourCanvas::Item* item, C
                break;
        }
 
-       if (dynamic_cast<AudioRegionGainLine*> (&cp->line) != 0) {
-               type = GainControlPointItem;
-       } else if (dynamic_cast<AutomationGainLine*> (&cp->line) != 0) {
-               type = GainAutomationControlPointItem;
-       } else if (dynamic_cast<AutomationPanLine*> (&cp->line) != 0) {
-               type = PanAutomationControlPointItem;
-       } else if (dynamic_cast<RedirectAutomationLine*> (&cp->line) != 0) {
-               type = RedirectAutomationControlPointItem;
-       } else {
-               return false;
-       }
-
-       return typed_event (item, event, type);
+       return typed_event (item, event, ControlPointItem);
 }
 
 bool
@@ -607,14 +593,8 @@ Editor::canvas_line_event (GdkEvent *event, ArdourCanvas::Item* item, Automation
 
        if (dynamic_cast<AudioRegionGainLine*> (al) != 0) {
                type = GainLineItem;
-       } else if (dynamic_cast<AutomationGainLine*> (al) != 0) {
-               type = GainAutomationLineItem;
-       } else if (dynamic_cast<AutomationPanLine*> (al) != 0) {
-               type = PanAutomationLineItem;
-       } else if (dynamic_cast<RedirectAutomationLine*> (al) != 0) {
-               type = RedirectAutomationLineItem;
        } else {
-               return false;
+               type = AutomationLineItem;
        }
 
        return typed_event (item, event, type);
@@ -736,8 +716,8 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
        case GDK_3BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &clicked_regionview->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &clicked_regionview->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, RegionViewNameHighlight);
                break;
        case GDK_BUTTON_RELEASE:
@@ -776,8 +756,8 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item
        case GDK_3BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &clicked_regionview->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &clicked_regionview->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, RegionViewName);
                break;
        case GDK_BUTTON_RELEASE:
@@ -855,12 +835,6 @@ Editor::canvas_playhead_cursor_event (GdkEvent *event, ArdourCanvas::Item* item)
        return typed_event (item, event, PlayheadCursorItem);
 }
 
-bool
-Editor::canvas_edit_cursor_event (GdkEvent *event, ArdourCanvas::Item* item)
-{
-       return typed_event (item, event, EditCursorItem);
-}
-
 bool
 Editor::canvas_zoom_rect_event (GdkEvent *event, ArdourCanvas::Item* item)
 {