Trim dependence on evoral types.hpp and Beats.hpp

[ardour.git] / libs / evoral / evoral / types.hpp

diff --git a/libs/evoral/evoral/types.hpp b/libs/evoral/evoral/types.hpp
index 9e48a68e3c1b8d2ae50e7cf133ab788bb65aa67b..a5d4a8ca1e8f8e22a0771d6140d7a88ea2a0d088 100644 (file)
--- a/libs/evoral/evoral/types.hpp
+++ b/libs/evoral/evoral/types.hpp
@@ -1,16 +1,16 @@
 /* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
- * 
+ *
  * Evoral is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- * 
+ *
  * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -19,35 +19,37 @@
 #ifndef EVORAL_TYPES_HPP
 #define EVORAL_TYPES_HPP
 
+#include <float.h>
+#include <math.h>
 #include <stdint.h>
+
+#include <iostream>
+#include <limits>
 #include <list>
-#include <cmath>
 
-namespace Evoral {
+#include "evoral/visibility.h"
+#include "pbd/debug.h"
 
-/** Frame count (i.e. length of time in audio frames) */
-typedef uint32_t FrameTime;
+namespace Evoral {
 
-/** Musical time: beats relative to some defined origin */
-typedef double MusicalTime;
-
-static inline bool musical_time_equal (MusicalTime a, MusicalTime b) {
-        /* acceptable tolerance is 1 tick. Nice if there was no magic number here */
-       return fabs (a - b) <= (1.0/1920.0); 
-}
+/** ID of an event (note or other). This must be operable on by glib
+    atomic ops
+*/
+typedef int32_t event_id_t;
 
 /** Type of an event (opaque, mapped by application) */
 typedef uint32_t EventType;
 
-/** Type to describe the movement of a time range */   
-template<typename T>
-struct RangeMove {
-       RangeMove (T f, FrameTime l, T t) : from (f), length (l), to (t) {}
-       T         from;   ///< start of the range
-       FrameTime length; ///< length of the range
-       T         to;     ///< new start of the range
-};
+class Beats;
 
 } // namespace Evoral
 
+namespace PBD {
+       namespace DEBUG {
+               LIBEVORAL_API extern DebugBits Sequence;
+               LIBEVORAL_API extern DebugBits Note;
+               LIBEVORAL_API extern DebugBits ControlList;
+       }
+}
+
 #endif // EVORAL_TYPES_HPP