From 21ce34c2cd04a2e7e133ff693b84c054182f4f91 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 16 May 2013 08:36:47 +0100
Subject: Compiles; strange hang on adding content to a film.

---
 src/lib/types.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/lib/types.h')

diff --git a/src/lib/types.h b/src/lib/types.h
index 5e4826918..4b8b8072d 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -21,15 +21,19 @@
 #define DCPOMATIC_TYPES_H
 
 #include <vector>
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <libdcp/util.h>
 
 class Content;
 
-typedef std::vector<boost::shared_ptr<Content> > ContentList;
 typedef int64_t ContentAudioFrame;
-typedef int ContentVideoFrame;
-typedef double Time;
+typedef int     ContentVideoFrame;
+typedef int64_t Time;
+#define TIME_MAX INT64_MAX
+#define TIME_HZ  96000
+typedef int64_t OutputAudioFrame;
+typedef int     OutputVideoFrame;
 
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
-- 
cgit v1.2.3