X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ftempo_map_importer.cc;h=b170aea8ea9a2bfb2389f227e383369335aafb4c;hb=ecbd2ebb7446f9f3069145ea8b233e30a9218060;hp=07e6dd06e41f5fdd826e6df80f56734e67fafcaa;hpb=38382b792113cbf23881c1dca64e16c2d0207d45;p=ardour.git

diff --git a/libs/ardour/tempo_map_importer.cc b/libs/ardour/tempo_map_importer.cc
index 07e6dd06e4..b170aea8ea 100644
--- a/libs/ardour/tempo_map_importer.cc
+++ b/libs/ardour/tempo_map_importer.cc
@@ -18,17 +18,18 @@
 
 */
 
-#include <ardour/tempo_map_importer.h>
+#include "ardour/tempo_map_importer.h"
 
 #include <sstream>
 
-#include <ardour/session.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/compose.h>
-#include <pbd/error.h>
+#include "ardour/session.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/compose.h"
+#include "pbd/error.h"
 
 #include "i18n.h"
 
+using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
@@ -38,11 +39,11 @@ TempoMapImportHandler::TempoMapImportHandler (XMLTree const & source, Session &
 {
 	XMLNode const * root = source.root();
 	XMLNode const * tempo_map;
-	
+
 	if (!(tempo_map = root->child (X_("TempoMap")))) {
 		throw failed_constructor();
 	}
-	
+
 	elements.push_back (ElementPtr ( new TempoMapImporter (source, session, *tempo_map)));
 }
 
@@ -53,7 +54,7 @@ TempoMapImportHandler::get_info () const
 }
 
 /*** TempoMapImporter ***/
-TempoMapImporter::TempoMapImporter (XMLTree const & source, Session & session, XMLNode const & node) : 
+TempoMapImporter::TempoMapImporter (XMLTree const & source, Session & session, XMLNode const & node) :
   ElementImporter (source, session),
   xml_tempo_map (node)
 {
@@ -67,7 +68,7 @@ TempoMapImporter::get_info () const
 	unsigned int tempos = 0;
 	unsigned int meters = 0;
 	XMLNodeList children = xml_tempo_map.children();
-	
+
 	for (XMLNodeIterator it = children.begin(); it != children.end(); it++) {
 		if ((*it)->name() == "Tempo") {
 			tempos++;
@@ -75,10 +76,10 @@ TempoMapImporter::get_info () const
 			meters++;
 		}
 	}
-	
+
 	// return info
 	oss << _("Tempo marks: ") << tempos << _("\nMeter marks: ") << meters;
-	
+
 	return oss.str();
 }
 
@@ -86,8 +87,8 @@ bool
 TempoMapImporter::_prepare_move ()
 {
 	// Prompt user for verification
-	bool replace = Prompt (_("This will replace the current tempo map!\nAre you shure you want to do this?"));
-	return replace;
+	boost::optional<bool> replace = Prompt (_("This will replace the current tempo map!\nAre you shure you want to do this?"));
+	return replace.get_value_or (false);
 }
 
 void
@@ -98,5 +99,5 @@ TempoMapImporter::_cancel_move ()
 void
 TempoMapImporter::_move ()
 {
-	session.tempo_map().set_state (xml_tempo_map);
+	session.tempo_map().set_state (xml_tempo_map, Stateful::current_state_version);
 }