diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-13 18:47:49 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
| commit | 5ef01352830ddbd913f5ea05d795f7863d2874e9 (patch) | |
| tree | eee0035642c54e899f69cb0b4906f83a9abd291d /libs | |
| parent | 89f105892cfff9aa79a7b1633085005c9285dc65 (diff) | |
remove Evoral types.cpp since it is no longer required
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/evoral/evoral/Beats.hpp | 3 | ||||
| -rw-r--r-- | libs/evoral/src/types.cpp | 1 | ||||
| -rw-r--r-- | libs/evoral/wscript | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/libs/evoral/evoral/Beats.hpp b/libs/evoral/evoral/Beats.hpp index 99e0c007c5..c85959260a 100644 --- 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 db061fd8e9..24adf9c5c3 100644 --- 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 9ceab182a5..bcc9f05691 100644 --- 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 |