X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation_importer.cc;h=655a8f1a848c0b641582b881a6110f084f3ae5a1;hb=7d96960b162d25da87c388a3083775e8770bba56;hp=31a49e44f56d68850bdf98a7bedcbf73e2e2ed39;hpb=3b89d9eaa03406a5e03648f47734211f09b89d62;p=ardour.git

diff --git a/libs/ardour/location_importer.cc b/libs/ardour/location_importer.cc
index 31a49e44f5..655a8f1a84 100644
--- a/libs/ardour/location_importer.cc
+++ b/libs/ardour/location_importer.cc
@@ -39,11 +39,11 @@ LocationImportHandler::LocationImportHandler (XMLTree const & source, Session &
 {
 	XMLNode const *root = source.root();
 	XMLNode const * location_node;
-	
+
 	if (!(location_node = root->child ("Locations"))) {
 		throw failed_constructor();
 	}
-	
+
 	// Construct importable locations
 	XMLNodeList const & locations = location_node->children();
 	for (XMLNodeList::const_iterator it = locations.begin(); it != locations.end(); it++) {
@@ -62,7 +62,7 @@ LocationImportHandler::get_info () const
 }
 
 /*** LocationImporter ***/
-LocationImporter::LocationImporter (XMLTree const & source, Session & session, LocationImportHandler & handler, XMLNode const & node) : 
+LocationImporter::LocationImporter (XMLTree const & source, Session & session, LocationImportHandler & handler, XMLNode const & node) :
   ElementImporter (source, session),
   handler (handler),
   xml_location (node),
@@ -71,7 +71,7 @@ LocationImporter::LocationImporter (XMLTree const & source, Session & session, L
 	// Parse XML
 	bool name_ok = false;
 	XMLPropertyList props = xml_location.properties();
-	
+
 	for (XMLPropertyIterator it = props.begin(); it != props.end(); ++it) {
 		string prop = (*it)->name();
 		if (!prop.compare ("id") || !prop.compare ("flags") || !prop.compare ("locked")) {
@@ -87,7 +87,7 @@ LocationImporter::LocationImporter (XMLTree const & source, Session & session, L
 			std::cerr << string_compose (X_("LocationImporter did not recognise XML-property \"%1\""), prop) << endmsg;
 		}
 	}
-	
+
 	if (!name_ok) {
 		error << X_("LocationImporter did not find necessary XML-property \"name\"") << endmsg;
 		throw failed_constructor();
@@ -105,27 +105,27 @@ string
 LocationImporter::get_info () const
 {
 	nframes_t start, end;
-	SMPTE::Time start_time, end_time;
-	
+	Timecode::Time start_time, end_time;
+
 	// Get sample positions
 	std::istringstream iss_start (xml_location.property ("start")->value());
 	iss_start >> start;
 	std::istringstream iss_end (xml_location.property ("end")->value());
 	iss_end >> end;
-	
-	// Convert to smpte
-	session.sample_to_smpte (start, start_time, true, false);
-	session.sample_to_smpte (end, end_time, true, false);
-	
+
+	// Convert to timecode
+	session.sample_to_timecode (start, start_time, true, false);
+	session.sample_to_timecode (end, end_time, true, false);
+
 	// return info
 	std::ostringstream oss;
 	if (start == end) {
-		oss << _("Location: ") << smpte_to_string (start_time);
+		oss << _("Location: ") << timecode_to_string (start_time);
 	} else {
-		oss << _("Range\nstart: ") << smpte_to_string (start_time) <<
-		  _("\nend: ") << smpte_to_string (end_time);
+		oss << _("Range\nstart: ") << timecode_to_string (start_time) <<
+		  _("\nend: ") << timecode_to_string (end_time);
 	}
-	
+
 	return oss.str();
 }
 
@@ -137,40 +137,40 @@ LocationImporter::_prepare_move ()
 		location = new Location (original); // Updates id
 	} catch (failed_constructor& err) {
 		throw std::runtime_error (X_("Error in session file!"));
- 		return false;
+		return false;
 	}
-	
+
 	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;
 		}
-		
+
 		name = rename_pair.second;
 		location->set_auto_punch (false, this);
 		location->set_is_range_marker (true, this);
 	}
-	
+
 	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);
 		location->set_is_range_marker (true, this);
 	}
-	
+
 	// duplicate name checking
 	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;
 		}
 	}
-	
+
 	location->set_name (name);
 
 	return true;
@@ -178,7 +178,7 @@ LocationImporter::_prepare_move ()
 
 void
 LocationImporter::_cancel_move ()
-{	
+{
 	delete location;
 	location = 0;
 }