X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_track_importer.h;h=87b3b25177ef31e0ae86ad74207792dff343b17b;hb=022818b4a796f52c0a91eea42e65aec0bc7bed43;hp=212762ee0441e55c10713897e4be703686e4ec83;hpb=5de817c2509b3f8ab35e1aea7292e84ca51037ab;p=ardour.git

diff --git a/libs/ardour/ardour/audio_track_importer.h b/libs/ardour/ardour/audio_track_importer.h
index 212762ee04..87b3b25177 100644
--- a/libs/ardour/ardour/audio_track_importer.h
+++ b/libs/ardour/ardour/audio_track_importer.h
@@ -21,42 +21,69 @@
 #ifndef __ardour_audio_track_importer_h__
 #define __ardour_audio_track_importer_h__
 
+#include <list>
+
 #include <pbd/xml++.h>
+#include <pbd/id.h>
 
 #include <ardour/element_importer.h>
 #include <ardour/element_import_handler.h>
 
 namespace ARDOUR {
 
+class AudioPlaylistImportHandler;
+class AudioPlaylistImporter;
 
 class AudioTrackImportHandler : public ElementImportHandler
 {
   public:
-	AudioTrackImportHandler (XMLTree const & source, Session & session);
+	AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler);
 	virtual ~AudioTrackImportHandler () {}
 	virtual string get_info () const;
+
+  private:
+	AudioPlaylistImportHandler & pl_handler;
 };
 
 
 class AudioTrackImporter : public ElementImporter
 {
   public:
-	AudioTrackImporter (XMLTree const & source, Session & session, AudioTrackImportHandler & handler, XMLNode const & node);
+	AudioTrackImporter (XMLTree const & source,
+	                    Session & session,
+	                    AudioTrackImportHandler & track_handler,
+	                    XMLNode const & node,
+	                    AudioPlaylistImportHandler & pl_handler);
+	~AudioTrackImporter ();
 
 	string get_info () const;
-	bool prepare_move ();
-	void cancel_move ();
-	void move ();
+
+  protected:
+	bool _prepare_move ();
+	void _cancel_move ();
+	void _move ();
 
   private:
 
-	bool parse_io (XMLNode const & node);
-	bool parse_processor (XMLNode const & node);
+	typedef boost::shared_ptr<AudioPlaylistImporter> PlaylistPtr;
+	typedef std::list<PlaylistPtr> PlaylistList;
+
+	bool parse_route_xml ();
+	bool parse_io ();
 	
-	bool parse_controllable (XMLNode const & node, XMLNode & dest_parent);
+	bool parse_processor (XMLNode & node);
+	bool parse_controllable (XMLNode & node);
+	bool parse_automation (XMLNode & node);
+	bool rate_convert_events (XMLNode & node);
 	
+	AudioTrackImportHandler & track_handler;
 	XMLNode xml_track;
 	
+	PBD::ID old_ds_id;
+	PBD::ID new_ds_id;
+	
+	PlaylistList playlists;
+	AudioPlaylistImportHandler & pl_handler;
 };
 
 } // namespace ARDOUR