X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_playlist_importer.cc;h=c1afdfe535e1862b24481f0bd4a77eef6c21cbe5;hb=4250940ad83200e065b966d0646c75a48bb0f73d;hp=aaa237c860719e7d68683f285a7e88a0f54bb9f6;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/ardour/audio_playlist_importer.cc b/libs/ardour/audio_playlist_importer.cc
index aaa237c860..c1afdfe535 100644
--- a/libs/ardour/audio_playlist_importer.cc
+++ b/libs/ardour/audio_playlist_importer.cc
@@ -28,9 +28,12 @@
 
 #include "ardour/audio_region_importer.h"
 #include "ardour/session.h"
-#include "ardour/playlist.h"
 #include "ardour/playlist_factory.h"
+#include "ardour/session_playlists.h"
 
+#include "pbd/i18n.h"
+
+using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
@@ -41,14 +44,14 @@ AudioPlaylistImportHandler::AudioPlaylistImportHandler (XMLTree const & source,
 {
 	XMLNode const * root = source.root();
 	XMLNode const * playlists;
-	
+
 	if (!(playlists = root->child (nodename))) {
 		throw failed_constructor();
 	}
-	
+
 	XMLNodeList const & pl_children = playlists->children();
 	for (XMLNodeList::const_iterator it = pl_children.begin(); it != pl_children.end(); ++it) {
-		const XMLProperty* type = (*it)->property("type");
+		XMLProperty const * type = (*it)->property("type");
 		if ( !type || type->value() == "audio" ) {
 			try {
 				elements.push_back (ElementPtr ( new AudioPlaylistImporter (source, session, *this, **it)));
@@ -72,7 +75,7 @@ AudioPlaylistImportHandler::get_regions (XMLNode const & node, ElementList & lis
 }
 
 void
-AudioPlaylistImportHandler::update_region_id (XMLProperty* id_prop)
+AudioPlaylistImportHandler::update_region_id (XMLProperty * id_prop)
 {
 	PBD::ID old_id (id_prop->value());
 	PBD::ID new_id (region_handler.get_new_id (old_id));
@@ -91,7 +94,7 @@ AudioPlaylistImportHandler::playlists_by_diskstream (PBD::ID const & id, Playlis
 }
 
 /*** AudioPlaylistImporter ***/
-AudioPlaylistImporter::AudioPlaylistImporter (XMLTree const & source, Session & session, AudioPlaylistImportHandler & handler, XMLNode const & node) : 
+AudioPlaylistImporter::AudioPlaylistImporter (XMLTree const & source, Session & session, AudioPlaylistImportHandler & handler, XMLNode const & node) :
   ElementImporter (source, session),
   handler (handler),
   orig_node (node),
@@ -99,9 +102,9 @@ AudioPlaylistImporter::AudioPlaylistImporter (XMLTree const & source, Session &
   diskstream_id ("0")
 {
 	bool ds_ok = false;
-	
+
 	populate_region_list ();
-	
+
 	// Parse XML
 	XMLPropertyList const & props = xml_playlist.properties();
 	for (XMLPropertyList::const_iterator it = props.begin(); it != props.end(); ++it) {
@@ -117,7 +120,7 @@ AudioPlaylistImporter::AudioPlaylistImporter (XMLTree const & source, Session &
 			std::cerr << string_compose (X_("AudioPlaylistImporter did not recognise XML-property \"%1\""), prop) << endmsg;
 		}
 	}
-	
+
 	if (!ds_ok) {
 		error << string_compose (X_("AudioPlaylistImporter (%1): did not find XML-property \"orig_diskstream_id\" which is mandatory"), name) << endmsg;
 		throw failed_constructor();
@@ -136,7 +139,7 @@ AudioPlaylistImporter::AudioPlaylistImporter (AudioPlaylistImporter const & othe
 
 AudioPlaylistImporter::~AudioPlaylistImporter ()
 {
-	
+
 }
 
 string
@@ -145,21 +148,21 @@ AudioPlaylistImporter::get_info () const
 	XMLNodeList children = xml_playlist.children();
 	unsigned int regions = 0;
 	std::ostringstream oss;
-	
+
 	for (XMLNodeIterator it = children.begin(); it != children.end(); it++) {
 		if ((*it)->name() == "Region") {
 			++regions;
 		}
 	}
-	
+
 	oss << regions << " ";
-	
+
 	if (regions == 1) {
 		oss << _("region");
 	} else {
 		oss << _("regions");
 	}
-	
+
 	return oss.str();
 }
 
@@ -167,16 +170,23 @@ bool
 AudioPlaylistImporter::_prepare_move ()
 {
 	// Rename
-	while (session.playlist_by_name (name) || !handler.check_name (name)) {
-		std::pair<bool, string> rename_pair = Rename (_("A playlist with this name already exists, please rename it."), name);
+	while (session.playlists->by_name (name) || !handler.check_name (name)) {
+		std::pair<bool, string> rename_pair = *Rename (_("A playlist with this name already exists, please rename it."), name);
 		if (!rename_pair.first) {
 			return false;
 		}
 		name = rename_pair.second;
 	}
-	xml_playlist.property ("name")->set_value (name);
+
+	XMLProperty * p = xml_playlist.property ("name");
+	if (!p) {
+		error << _("badly-formed XML in imported playlist") << endmsg;
+		return false;
+	}
+
+	p->set_value (name);
 	handler.add_name (name);
-	
+
 	return true;
 }
 
@@ -190,10 +200,10 @@ void
 AudioPlaylistImporter::_move ()
 {
 	boost::shared_ptr<Playlist> playlist;
-	
+
 	// Update diskstream id
 	xml_playlist.property ("orig-diskstream-id")->set_value (diskstream_id.to_s());
-	
+
 	// Update region XML in playlist and prepare sources
 	xml_playlist.remove_nodes("Region");
 	for (RegionList::iterator it = regions.begin(); it != regions.end(); ++it) {
@@ -205,31 +215,32 @@ AudioPlaylistImporter::_move ()
 			return; // TODO clean up?
 		}
 	}
-	
+
 	// Update region ids in crossfades
 	XMLNodeList crossfades = xml_playlist.children("Crossfade");
 	for (XMLNodeIterator it = crossfades.begin(); it != crossfades.end(); ++it) {
-		XMLProperty* in = (*it)->property("in");
-		XMLProperty* out = (*it)->property("out");
+		XMLProperty * in = (*it)->property("in");
+		XMLProperty * out = (*it)->property("out");
 		if (!in || !out) {
 			error << string_compose (X_("AudioPlaylistImporter (%1): did not find the \"in\" or \"out\" property from a crossfade"), name) << endmsg;
+			continue; // or fatal?
 		}
-		
+
 		handler.update_region_id (in);
 		handler.update_region_id (out);
-		
+
 		// rate convert length and position
-		XMLProperty* length = (*it)->property("length");
+		XMLProperty * length = (*it)->property("length");
 		if (length) {
 			length->set_value (rate_convert_samples (length->value()));
 		}
-		
-		XMLProperty* position = (*it)->property("position");
+
+		XMLProperty * position = (*it)->property("position");
 		if (position) {
 			position->set_value (rate_convert_samples (position->value()));
 		}
 	}
-	
+
 	// Create playlist
 	playlist = PlaylistFactory::create (session, xml_playlist, false, true);
 }
@@ -250,3 +261,8 @@ AudioPlaylistImporter::populate_region_list ()
 	}
 }
 
+string
+UnusedAudioPlaylistImportHandler::get_info () const
+{
+	return _("Audio Playlists (unused)");
+}