projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
plugin-pin management.. nearly there
[ardour.git]
/
libs
/
ardour
/
tempo_map_importer.cc
diff --git
a/libs/ardour/tempo_map_importer.cc
b/libs/ardour/tempo_map_importer.cc
index 1d37383fb5bc65424427939365ddcf1cb7261668..5a6a2a4018fad57b0bf202f22ccb45bae88e314c 100644
(file)
--- a/
libs/ardour/tempo_map_importer.cc
+++ b/
libs/ardour/tempo_map_importer.cc
@@
-23,9
+23,8
@@
#include <sstream>
#include "ardour/session.h"
#include <sstream>
#include "ardour/session.h"
+#include "ardour/tempo.h"
#include "pbd/failed_constructor.h"
#include "pbd/failed_constructor.h"
-#include "pbd/compose.h"
-#include "pbd/error.h"
#include "i18n.h"
#include "i18n.h"
@@
-87,8
+86,8
@@
bool
TempoMapImporter::_prepare_move ()
{
// Prompt user for verification
TempoMapImporter::_prepare_move ()
{
// Prompt user for verification
- boo
l replace = Prompt (_("This will replace the current tempo map!\nAre you sh
ure you want to do this?"));
- return replace;
+ boo
st::optional<bool> replace = Prompt (_("This will replace the current tempo map!\nAre you s
ure you want to do this?"));
+ return replace
.get_value_or (false)
;
}
void
}
void
@@
-99,5
+98,5
@@
TempoMapImporter::_cancel_move ()
void
TempoMapImporter::_move ()
{
void
TempoMapImporter::_move ()
{
- session.tempo_map().set_state (xml_tempo_map);
+ session.tempo_map().set_state (xml_tempo_map
, Stateful::current_state_version
);
}
}