fixes for destructive track offsets of various kinds; move from jack_nframes_t -...

[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 29997f5f57f6dd85cfa587cb10582884880f9db5..ceff15154126a4cacc8a22c030ffcf45d81ab931 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -21,13 +21,13 @@
 #include <cstdlib>
 #include <cmath>
 
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/audioplaylist.h>
 
 #include "editor.h"
 #include "public_editor.h"
-#include "regionview.h"
-#include "streamview.h"
+#include "audio_region_view.h"
+#include "audio_streamview.h"
 #include "crossfade_view.h"
 #include "audio_time_axis.h"
 #include "region_gain_line.h"
@@ -42,6 +42,7 @@
 
 using namespace sigc;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 
 bool
@@ -69,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)) {
@@ -100,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)) {
@@ -211,7 +212,7 @@ Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type)
 }
 
 bool
-Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
+Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView *rv)
 {
        gint ret = FALSE;
 
@@ -250,7 +251,7 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Aud
 }
 
 bool
-Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, AudioTimeAxisView *tv)
+Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, RouteTimeAxisView *tv)
 {
        bool ret = FALSE;
        
@@ -261,7 +262,7 @@ Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, Aud
                clicked_regionview = 0;
                clicked_control_point = 0;
                clicked_trackview = tv;
-               clicked_audio_trackview = tv;
+               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(tv);
                ret = button_press_handler (item, event, StreamItem);
                break;
 
@@ -467,7 +468,7 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
 }
 
 struct DescendingRegionLayerSorter {
-    bool operator()(Region* a, Region* b) {
+    bool operator()(boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
            return a->layer() > b->layer();
     }
 };
@@ -511,22 +512,25 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
        if ((atv = dynamic_cast<AudioTimeAxisView*>(&tv)) != 0) {
 
                if (atv->is_audio_track()) {
-                       
-                       AudioPlaylist* pl = atv->get_diskstream()->playlist();
-                       Playlist::RegionList* rl = pl->regions_at (event_frame (event));
 
-                       if (!rl->empty()) {
-                               DescendingRegionLayerSorter cmp;
-                               rl->sort (cmp);
+                       AudioPlaylist* pl;
+                       if ((pl = dynamic_cast<AudioPlaylist*> (atv->get_diskstream()->playlist())) != 0) {
+
+                               Playlist::RegionList* rl = pl->regions_at (event_frame (event));
+
+                               if (!rl->empty()) {
+                                       DescendingRegionLayerSorter cmp;
+                                       rl->sort (cmp);
 
-                               AudioRegionView* arv = atv->view->find_view (*(dynamic_cast<AudioRegion*> (rl->front())));
+                                       RegionView* rv = atv->view()->find_view (rl->front());
 
-                               /* proxy */
-                               
-                               delete rl;
+                                       /* proxy */
 
-                               return canvas_region_view_event (event, arv->get_canvas_group(), arv);
-                       } 
+                                       delete rl;
+
+                                       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
+                               } 
+                       }
                }
        }
 
@@ -695,7 +699,7 @@ Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* it
 
 
 bool
-Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::Item* item, AudioRegionView* rv)
+Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv)
 {
        bool ret = false;
        
@@ -707,20 +711,20 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
                clicked_control_point = 0;
                clicked_trackview = &clicked_regionview->get_time_axis_view();
                clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
-               ret = button_press_handler (item, event, AudioRegionViewNameHighlight);
+               ret = button_press_handler (item, event, RegionViewNameHighlight);
                break;
        case GDK_BUTTON_RELEASE:
-               ret = button_release_handler (item, event, AudioRegionViewNameHighlight);
+               ret = button_release_handler (item, event, RegionViewNameHighlight);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, AudioRegionViewNameHighlight);
+               ret = motion_handler (item, event, RegionViewNameHighlight);
                break;
        case GDK_ENTER_NOTIFY:
-               ret = enter_handler (item, event, AudioRegionViewNameHighlight);
+               ret = enter_handler (item, event, RegionViewNameHighlight);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               ret = leave_handler (item, event, AudioRegionViewNameHighlight);
+               ret = leave_handler (item, event, RegionViewNameHighlight);
                break;
 
        default:
@@ -731,7 +735,7 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
 }
 
 bool
-Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView* rv)
+Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView* rv)
 {
        bool ret = false;
 
@@ -743,20 +747,20 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item
                clicked_control_point = 0;
                clicked_trackview = &clicked_regionview->get_time_axis_view();
                clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
-               ret = button_press_handler (item, event, AudioRegionViewName);
+               ret = button_press_handler (item, event, RegionViewName);
                break;
        case GDK_BUTTON_RELEASE:
-               ret = button_release_handler (item, event, AudioRegionViewName);
+               ret = button_release_handler (item, event, RegionViewName);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, AudioRegionViewName);
+               ret = motion_handler (item, event, RegionViewName);
                break;
        case GDK_ENTER_NOTIFY:
-               ret = enter_handler (item, event, AudioRegionViewName);
+               ret = enter_handler (item, event, RegionViewName);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               ret = leave_handler (item, event, AudioRegionViewName);
+               ret = leave_handler (item, event, RegionViewName);
                break;
 
        default: