X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=b2c7554a2a012f9ba40468b17b4cb6c7ab905bbb;hb=76c25a4a4459b8e550c3c687458d04db0beaee77;hp=8e635bbe13a20bfc7ac49673b017bf00b965dd3e;hpb=6f4a92f740b2fd75794489ce58f9348f8adf6bf4;p=ardour.git

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 8e635bbe13..b2c7554a2a 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -70,13 +70,13 @@ 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)) {
 			if (!current_stepping_trackview) {
 				step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-				if (!(current_stepping_trackview = dynamic_cast<AudioTimeAxisView*> (trackview_by_y_position (ev->y)))) {
+				if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) {
 					return false;
 				}
 			}
@@ -101,13 +101,13 @@ 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)) {
 			if (!current_stepping_trackview) {
 				step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-				if (!(current_stepping_trackview = dynamic_cast<AudioTimeAxisView*> (trackview_by_y_position (ev->y)))) {
+				if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) {
 					return false;
 				}
 			}
@@ -468,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();
     }
 };
@@ -513,8 +513,8 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 
 		if (atv->is_audio_track()) {
 
-			AudioPlaylist* pl;
-			if ((pl = dynamic_cast<AudioPlaylist*> (atv->get_diskstream()->playlist())) != 0) {
+			boost::shared_ptr<AudioPlaylist> pl;
+			if ((pl = boost::dynamic_pointer_cast<AudioPlaylist> (atv->get_diskstream()->playlist())) != 0) {
 
 				Playlist::RegionList* rl = pl->regions_at (event_frame (event));
 
@@ -522,7 +522,7 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 					DescendingRegionLayerSorter cmp;
 					rl->sort (cmp);
 
-					RegionView* rv = atv->view()->find_view (*rl->front());
+					RegionView* rv = atv->view()->find_view (rl->front());
 
 					/* proxy */