More work on track import and some cleaning up of ElementImporter interface

git-svn-id: svn://localhost/ardour2/branches/3.0@4265 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 5 deletions

diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc
index 4ab06d7cc2..3776c3c04c 100644
--- a/gtk2_ardour/session_import_dialog.cc
+++ b/gtk2_ardour/session_import_dialog.cc
@@ -105,13 +105,13 @@ void
 SessionImportDialog::load_session (const string& filename)
 {
 	tree.read (filename);
-	AudioRegionImportHandler *region_handler;
+	boost::shared_ptr<AudioRegionImportHandler> region_handler (new AudioRegionImportHandler (tree, target));
+	boost::shared_ptr<AudioPlaylistImportHandler> pl_handler (new AudioPlaylistImportHandler (tree, target, *region_handler));
 	
-	region_handler = new AudioRegionImportHandler (tree, target);
-	handlers.push_back (HandlerPtr(region_handler));
-	handlers.push_back (HandlerPtr(new AudioPlaylistImportHandler (tree, target, *region_handler)));
+	handlers.push_back (boost::static_pointer_cast<ElementImportHandler> (region_handler));
+	handlers.push_back (boost::static_pointer_cast<ElementImportHandler> (pl_handler));
 	handlers.push_back (HandlerPtr(new UnusedAudioPlaylistImportHandler (tree, target, *region_handler)));
-	handlers.push_back (HandlerPtr(new AudioTrackImportHandler (tree, target)));
+	handlers.push_back (HandlerPtr(new AudioTrackImportHandler (tree, target, *pl_handler)));
 	handlers.push_back (HandlerPtr(new LocationImportHandler (tree, target)));
 	handlers.push_back (HandlerPtr(new TempoMapImportHandler (tree, target)));