diff options
author | Carl Hetherington <carl@carlh.net> | 2009-07-09 17:58:13 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-07-09 17:58:13 +0000 |
commit | 402cc384ced6cb152c8abe4294009fe0de0a6dea (patch) | |
tree | f01db6b412cb8e2d3c69fa123fd615c229ee47d3 /gtk2_ardour/editor_canvas.cc | |
parent | cc351b97a986fca48a6b3b631a292bf24efc5e41 (diff) |
Back out big shared_ptr change. Moving to a branch. Apologies all.
git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
-rw-r--r-- | gtk2_ardour/editor_canvas.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index ae8a7a230d..498a6cc0fd 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -459,9 +459,9 @@ Editor::idle_drop_paths (vector<ustring> paths, nframes64_t frame, double ypos) void Editor::drop_paths_part_two (const vector<ustring>& paths, nframes64_t frame, double ypos) { - RouteTimeAxisViewPtr tv; + RouteTimeAxisView* tv; - std::pair<TimeAxisViewPtr, int> const tvp = trackview_by_y_position (ypos); + std::pair<TimeAxisView*, int> const tvp = trackview_by_y_position (ypos); if (tvp.first == 0) { /* drop onto canvas background: create new tracks */ @@ -474,13 +474,13 @@ Editor::drop_paths_part_two (const vector<ustring>& paths, nframes64_t frame, do do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame); } - } else if ((tv = boost::dynamic_pointer_cast<RouteTimeAxisView> (tvp.first)) != 0) { + } else if ((tv = dynamic_cast<RouteTimeAxisView*> (tvp.first)) != 0) { /* check that its an audio track, not a bus */ if (tv->get_diskstream()) { /* select the track, then embed/import */ - selection->set (boost::static_pointer_cast<TimeAxisView> (tv)); + selection->set (tv); if (Profile->get_sae() || Config->get_only_copy_imported_files()) { do_import (paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame); @@ -756,7 +756,7 @@ Editor::stop_canvas_autoscroll () bool Editor::left_track_canvas (GdkEventCrossing *ev) { - set_entered_track (TimeAxisViewPtr ()); + set_entered_track (0); set_entered_regionview (0); reset_canvas_action_sensitivity (false); return false; |