summaryrefslogtreecommitdiff
path: root/src/lib/types.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-16 08:36:47 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-16 08:36:47 +0100
commit21ce34c2cd04a2e7e133ff693b84c054182f4f91 (patch)
tree5bda50a34b2fa7526dcd682578247f75a85d26b1 /src/lib/types.h
parent0db016f90ae722fc8b72d465e21d9f153f72b340 (diff)
Compiles; strange hang on adding content to a film.
Diffstat (limited to 'src/lib/types.h')
-rw-r--r--src/lib/types.h10
1 files changed, 7 insertions, 3 deletions
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.