projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PBD::canonical_path will no longer throw so change test
[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 1f9f5186148b884affd6b7962a3d72e802965269..91e2320337d17fdc4e18091d279d4dfb1fbc8442 100644
(file)
--- a/
libs/ardour/tempo_map_importer.cc
+++ b/
libs/ardour/tempo_map_importer.cc
@@
-23,11
+23,10
@@
#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 "
pbd/
i18n.h"
using namespace std;
using namespace PBD;
using namespace std;
using namespace PBD;
@@
-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