Another try at sorting out the thorny question of timing.

[dcpomatic.git] / src / lib / types.h

diff --git a/src/lib/types.h b/src/lib/types.h
index 4b8b8072d909caa311db52b815da8c888f6448cf..33f8239d88cbee89ace3e07b51acd94d67b27fd9 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -27,11 +27,9 @@
 
 class Content;
 
-typedef int64_t ContentAudioFrame;
-typedef int     ContentVideoFrame;
 typedef int64_t Time;
 #define TIME_MAX INT64_MAX
-#define TIME_HZ  96000
+#define TIME_HZ  ((Time) 96000)
 typedef int64_t OutputAudioFrame;
 typedef int     OutputVideoFrame;
 
@@ -76,6 +74,8 @@ struct Position
        int y;
 };
 
+namespace dcpomatic {
+
 /** @struct Rect
  *  @brief A rectangle.
  */
@@ -113,4 +113,6 @@ struct Rect
        bool contains (Position) const;
 };
 
+}
+
 #endif