move control surface prefs onto their own tab in the user prefs; for Generic MIDI...

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

diff --git a/libs/evoral/evoral/types.hpp b/libs/evoral/evoral/types.hpp
index 5ae646c292e839b67eab5b74fbc40aefec7cf1a8..000b79bb94c621b58046e2054cf8c7cf822c583e 100644 (file)
--- a/libs/evoral/evoral/types.hpp
+++ b/libs/evoral/evoral/types.hpp
@@ -1,5 +1,5 @@
 /* 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
@@ -28,8 +28,10 @@
 
 namespace Evoral {
 
-/** Frame count (i.e. length of time in audio frames) */
-typedef uint32_t FrameTime;
+/** ID of an event (note or other). This must be operable on by glib
+    atomic ops
+*/
+typedef int32_t event_id_t;
 
 /** Musical time: beats relative to some defined origin */
 typedef double MusicalTime;
@@ -41,25 +43,44 @@ static inline bool musical_time_equal (MusicalTime a, MusicalTime b) {
        return fabs (a - b) <= (1.0/1920.0);
 }
 
+static inline bool musical_time_less_than (MusicalTime a, MusicalTime b) {
+       /* acceptable tolerance is 1 tick. Nice if there was no magic number here */
+       if (fabs (a - b) <= (1.0/1920.0)) {
+               return false; /* effectively identical */
+       } else {
+               return a < b;
+       }
+}
+
+static inline bool musical_time_greater_than (MusicalTime a, MusicalTime b) {
+       /* acceptable tolerance is 1 tick. Nice if there was no magic number here */
+       if (fabs (a - b) <= (1.0/1920.0)) {
+               return false; /* effectively identical */
+       } else {
+               return a > b;
+       }
+}
+
+static inline bool musical_time_greater_or_equal_to (MusicalTime a, MusicalTime b) {
+       /* acceptable tolerance is 1 tick. Nice if there was no magic number here */
+       if (fabs (a - b) <= (1.0/1920.0)) {
+               return true; /* effectively identical, note the "or_equal_to" */
+       } else {
+               return a >= b;
+       }
+}
+
 /** 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
-};
-
 } // namespace Evoral
 
 namespace PBD {
-        namespace DEBUG {
-                extern uint64_t Sequence;
-                extern uint64_t Note;
-        }
+       namespace DEBUG {
+               extern uint64_t Sequence;
+               extern uint64_t Note;
+               extern uint64_t ControlList;
+       }
 }
 
 #endif // EVORAL_TYPES_HPP