X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation_importer.cc;h=281e045ae3d09c9b24c6d83460c3a81c7e1a9ca0;hb=9a0d7cafebcda82c4745b1db7d4d36aa37b8db4b;hp=6fb9f7b7db0e57b9b518a26c90eac112fe06ca53;hpb=fa5aeb7892fb73d45782b42da731bc5a51418e79;p=ardour.git

diff --git a/libs/ardour/location_importer.cc b/libs/ardour/location_importer.cc
index 6fb9f7b7db..281e045ae3 100644
--- a/libs/ardour/location_importer.cc
+++ b/libs/ardour/location_importer.cc
@@ -46,7 +46,7 @@ LocationImportHandler::LocationImportHandler (XMLTree const & source, Session &
 
 	// Construct importable locations
 	XMLNodeList const & locations = location_node->children();
-	for (XMLNodeList::const_iterator it = locations.begin(); it != locations.end(); it++) {
+	for (XMLNodeList::const_iterator it = locations.begin(); it != locations.end(); ++it) {
 		try {
 			elements.push_back (ElementPtr ( new LocationImporter (source, session, *this, **it)));
 		} catch (failed_constructor err) {
@@ -104,7 +104,7 @@ LocationImporter::~LocationImporter ()
 string
 LocationImporter::get_info () const
 {
-	nframes_t start, end;
+	framepos_t start, end;
 	Timecode::Time start_time, end_time;
 
 	// Get sample positions
@@ -133,7 +133,7 @@ bool
 LocationImporter::_prepare_move ()
 {
 	try {
-		Location const original (xml_location);
+		Location const original (session, xml_location);
 		location = new Location (original); // Updates id
 	} catch (failed_constructor& err) {
 		throw std::runtime_error (X_("Error in session file!"));
@@ -143,7 +143,7 @@ LocationImporter::_prepare_move ()
 	std::pair<bool, string> rename_pair;
 
 	if (location->is_auto_punch()) {
-		rename_pair = Rename (_("The location is the Punch range. It will be imported as a normal range.\nYou may rename the imported location:"), name);
+		rename_pair = *Rename (_("The location is the Punch range. It will be imported as a normal range.\nYou may rename the imported location:"), name);
 		if (!rename_pair.first) {
 			return false;
 		}
@@ -154,7 +154,7 @@ LocationImporter::_prepare_move ()
 	}
 
 	if (location->is_auto_loop()) {
-		rename_pair = Rename (_("The location is a Loop range. It will be imported as a normal range.\nYou may rename the imported location:"), name);
+		rename_pair = *Rename (_("The location is a Loop range. It will be imported as a normal range.\nYou may rename the imported location:"), name);
 		if (!rename_pair.first) { return false; }
 
 		location->set_auto_loop (false, this);
@@ -165,7 +165,7 @@ LocationImporter::_prepare_move ()
 	Locations::LocationList const & locations(session.locations()->list());
 	for (Locations::LocationList::const_iterator it = locations.begin(); it != locations.end(); ++it) {
 		if (!((*it)->name().compare (location->name())) || !handler.check_name (location->name())) {
-			rename_pair = Rename (_("A location with that name already exists.\nYou may rename the imported location:"), name);
+			rename_pair = *Rename (_("A location with that name already exists.\nYou may rename the imported location:"), name);
 			if (!rename_pair.first) { return false; }
 			name = rename_pair.second;
 		}