First revision with working track import

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

5 files changed, 7 insertions, 3 deletions

diff --git a/libs/ardour/ardour/audio_playlist_importer.h b/libs/ardour/ardour/audio_playlist_importer.h
index b94523128f..3a54367495 100644
--- a/libs/ardour/ardour/audio_playlist_importer.h
+++ b/libs/ardour/ardour/audio_playlist_importer.h
@@ -72,6 +72,7 @@ class AudioPlaylistImporter : public ElementImporter
   public:
 	AudioPlaylistImporter (XMLTree const & source, Session & session, AudioPlaylistImportHandler & handler, XMLNode const & node);
 	AudioPlaylistImporter (AudioPlaylistImporter const & other);
+	~AudioPlaylistImporter ();
 
 	string get_info () const;
 	
diff --git a/libs/ardour/ardour/audio_region_importer.h b/libs/ardour/ardour/audio_region_importer.h
index 8123f89e42..c968fc8129 100644
--- a/libs/ardour/ardour/audio_region_importer.h
+++ b/libs/ardour/ardour/audio_region_importer.h
@@ -72,6 +72,7 @@ class AudioRegionImporter : public ElementImporter
 {
   public:
 	AudioRegionImporter (XMLTree const & source, Session & session, AudioRegionImportHandler & handler, XMLNode const & node);
+	~AudioRegionImporter ();
 
 	// Interface implementation
 	string get_info () const;
diff --git a/libs/ardour/ardour/audio_track_importer.h b/libs/ardour/ardour/audio_track_importer.h
index 6beee4a408..87b3b25177 100644
--- a/libs/ardour/ardour/audio_track_importer.h
+++ b/libs/ardour/ardour/audio_track_importer.h
@@ -54,6 +54,7 @@ class AudioTrackImporter : public ElementImporter
 	                    AudioTrackImportHandler & track_handler,
 	                    XMLNode const & node,
 	                    AudioPlaylistImportHandler & pl_handler);
+	~AudioTrackImporter ();
 
 	string get_info () const;
 
diff --git a/libs/ardour/ardour/element_import_handler.h b/libs/ardour/ardour/element_import_handler.h
index 9393c31559..f56d3ce76d 100644
--- a/libs/ardour/ardour/element_import_handler.h
+++ b/libs/ardour/ardour/element_import_handler.h
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <list>
+#include <set>
 
 #include <boost/shared_ptr.hpp>
 
@@ -101,8 +102,8 @@ class ElementImportHandler
 	static bool _errors;
 	
   private:
-	/// List of names for duplicate checking
-	std::list<string> names;
+	/// Set of names for duplicate checking
+	std::set<string> names;
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 14e8c6d841..a5245b73f8 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -307,6 +307,7 @@ class Session : public PBD::StatefulDestructible
 	typedef std::list<boost::shared_ptr<Diskstream> > DiskstreamList;
 	typedef std::list<boost::shared_ptr<Route> >      RouteList;
 
+	int load_routes (const XMLNode&);
 	boost::shared_ptr<RouteList> get_routes() const {
 		return routes.reader ();
 	}
@@ -1446,7 +1447,6 @@ class Session : public PBD::StatefulDestructible
 	void   add_routes (RouteList&, bool save);
 	uint32_t destructive_index;
 
-	int load_routes (const XMLNode&);
 	boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&);
 
 	/* mixer stuff */