remove Evoral types.cpp since it is no longer required

diff --git a/libs/evoral/evoral/Beats.hpp b/libs/evoral/evoral/Beats.hpp
index 99e0c007c5df79cfbca146a7bfa49fd7f017eeba..c85959260a54336001b9f7e1f9f156f7fb0669a0 100644 (file)
--- a/libs/evoral/evoral/Beats.hpp
+++ b/libs/evoral/evoral/Beats.hpp
@@ -34,7 +34,7 @@ namespace Evoral {
 /** Musical time in beats. */
 class /*LIBEVORAL_API*/ Beats {
 public:
-       LIBEVORAL_API static const int32_t PPQN;
+       LIBEVORAL_API static const int32_t PPQN = 1920;
 
        Beats() : _beats(0), _ticks(0) {}
 
@@ -105,6 +105,7 @@ public:
 
                _beats = whole;
                _ticks = frac * PPQN;
+               return *this;
        }
 
        Beats& operator=(const Beats& other) {

diff --git a/libs/evoral/src/types.cpp b/libs/evoral/src/types.cpp
index db061fd8e9cc6af060a2376513cdf78a9608baea..24adf9c5c3c215e2d8639b2650abc63bf547cd12 100644 (file)
--- a/libs/evoral/src/types.cpp
+++ b/libs/evoral/src/types.cpp
@@ -23,7 +23,6 @@
 
 namespace Evoral {
 
-const double Beats::PPQN = 1920.0;
 const Beats  MaxBeats    = Evoral::Beats(DBL_MAX);
 const Beats  MinBeats    = Evoral::Beats(DBL_MIN);
 

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 9ceab182a5d30570212a53d2fe0819aec390ec91..bcc9f05691fbca87de0a9d94694407b0591c58a6 100644 (file)
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -96,7 +96,6 @@ def build(bld):
             src/Sequence.cpp
             src/TimeConverter.cpp
             src/debug.cpp
-            src/types.cpp
     '''
 
     # Library