convert codebase to use Temporal for various time types

6 files changed, 16 insertions, 11 deletions

diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp
index 13d7c6c6ac..444ad4cdfb 100644
--- a/libs/evoral/src/Event.cpp
+++ b/libs/evoral/src/Event.cpp
@@ -18,8 +18,8 @@
 
 #include <glib.h>
 
+#include "temporal/beats.h"
 #include "evoral/Event.hpp"
-#include "evoral/Beats.hpp"
 
 namespace Evoral {
 
@@ -162,7 +162,7 @@ Event<Timestamp>::set (const uint8_t* buf, uint32_t size, Timestamp t)
 
 #endif // EVORAL_EVENT_ALLOC
 
-template class Event<Evoral::Beats>;
+template class Event<Temporal::Beats>;
 template class Event<double>;
 template class Event<int64_t>;
 
diff --git a/libs/evoral/src/Note.cpp b/libs/evoral/src/Note.cpp
index 631a995ab3..10b3b4314f 100644
--- a/libs/evoral/src/Note.cpp
+++ b/libs/evoral/src/Note.cpp
@@ -24,7 +24,7 @@
 #include "evoral/Note.hpp"
 #endif
 
-#include "evoral/Beats.hpp"
+#include "temporal/beats.h"
 
 namespace Evoral {
 
@@ -90,7 +90,7 @@ Note<Time>::set_id (event_id_t id)
 	_off_event.set_id (id);
 }
 
-template class Note<Evoral::Beats>;
+template class Note<Temporal::Beats>;
 
 } // namespace Evoral
 
diff --git a/libs/evoral/src/OldSMF.cpp b/libs/evoral/src/OldSMF.cpp
index eef61e332b..8b284f9d95 100644
--- a/libs/evoral/src/OldSMF.cpp
+++ b/libs/evoral/src/OldSMF.cpp
@@ -364,6 +364,6 @@ SMF<Time>::write_var_len(uint32_t value)
 	return ret;
 }
 
-template class SMF<Evoral::Beats>;
+template class SMF<Temporal::Beats>;
 
 } // namespace Evoral
diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp
index 14e3b65f37..b94ac088f5 100644
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -31,7 +31,8 @@
 #include "pbd/compose.h"
 #include "pbd/error.h"
 
-#include "evoral/Beats.hpp"
+#include "temporal/beats.h"
+
 #include "evoral/Control.hpp"
 #include "evoral/ControlList.hpp"
 #include "evoral/ControlSet.hpp"
@@ -1408,6 +1409,6 @@ Sequence<Time>::dump (ostream& str) const
 	str << "--- dump\n";
 }
 
-template class Sequence<Evoral::Beats>;
+template class Sequence<Temporal::Beats>;
 
 } // namespace Evoral
diff --git a/libs/evoral/src/TimeConverter.cpp b/libs/evoral/src/TimeConverter.cpp
index e1e4b8231f..1e49e1e7e0 100644
--- a/libs/evoral/src/TimeConverter.cpp
+++ b/libs/evoral/src/TimeConverter.cpp
@@ -1,4 +1,4 @@
-/* This file is part of Evoral.
+/*
  * Copyright (C) 2008 David Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
  *
@@ -18,6 +18,9 @@
 
 #include <stdint.h>
 
+#include "temporal/beats.h"
+#include "temporal/types.h"
+
 #include "evoral/TimeConverter.hpp"
 #include "evoral/types.hpp"
 
@@ -43,8 +46,8 @@ IdentityConverter<A,B>::from(B b) const
 	return static_cast<A>(b);
 }
 
-template class IdentityConverter<double, framepos_t>;
-template class TimeConverter<double, framepos_t>;
-template class TimeConverter<Evoral::Beats, framepos_t>;
+template class IdentityConverter<double, Temporal::samplepos_t>;
+template class TimeConverter<double, Temporal::samplepos_t>;
+template class TimeConverter<Temporal::Beats, Temporal::samplepos_t>;
 
 } // namespace Evoral
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index bcc9f05691..0eb4b2cb4c 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -80,6 +80,7 @@ def build(bld):
     libsmf.name         = 'libsmf'
     libsmf.target       = 'smf'
     libsmf.uselib       = 'GLIB'
+    libsmf.use          = [ 'libtemporal' ]
     libsmf.install_path = None
     if bld.env['build_target'] != 'mingw':
         libsmf.cxxflags     = [ '-fPIC' ]