summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/evoral_types_convert.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-09-24 12:03:54 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-24 12:03:54 -0400
commit7db12f6b128eef0d63dd6a8eda3d04f4dab1fc79 (patch)
tree388aecd96220df899626709aeb8c7dbc37fd9088 /libs/ardour/ardour/evoral_types_convert.h
parent9283bee867ce788465f3e48ed889cd324e098e64 (diff)
convert codebase to use Temporal for various time types
Diffstat (limited to 'libs/ardour/ardour/evoral_types_convert.h')
-rw-r--r--libs/ardour/ardour/evoral_types_convert.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/ardour/evoral_types_convert.h b/libs/ardour/ardour/evoral_types_convert.h
index 38d6c61e99..bc2b989d44 100644
--- a/libs/ardour/ardour/evoral_types_convert.h
+++ b/libs/ardour/ardour/evoral_types_convert.h
@@ -22,7 +22,7 @@
#include "pbd/enum_convert.h"
-#include "evoral/Beats.hpp"
+#include "temporal/beats.h"
#include "evoral/ControlList.hpp"
namespace PBD {
@@ -30,24 +30,24 @@ namespace PBD {
DEFINE_ENUM_CONVERT(Evoral::ControlList::InterpolationStyle)
template <>
-inline bool to_string (Evoral::Beats beats, std::string& str)
+inline bool to_string (Temporal::Beats beats, std::string& str)
{
return double_to_string (beats.to_double (), str);
}
template <>
-inline bool string_to (const std::string& str, Evoral::Beats& beats)
+inline bool string_to (const std::string& str, Temporal::Beats& beats)
{
double tmp;
if (!string_to_double (str, tmp)) {
return false;
}
- beats = Evoral::Beats(tmp);
+ beats = Temporal::Beats(tmp);
return true;
}
template <>
-inline std::string to_string (Evoral::Beats beats)
+inline std::string to_string (Temporal::Beats beats)
{
std::string tmp;
double_to_string (beats.to_double (), tmp);
@@ -55,11 +55,11 @@ inline std::string to_string (Evoral::Beats beats)
}
template <>
-inline Evoral::Beats string_to (const std::string& str)
+inline Temporal::Beats string_to (const std::string& str)
{
double tmp;
string_to_double (str, tmp);
- return Evoral::Beats (tmp);
+ return Temporal::Beats (tmp);
}
} // namespace PBD