X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=35c7a91f9785865e1dada8d2449fa725f4149ae4;hb=034feb503b0a38eb82c21ae8d9f83522fc63a25c;hp=ad706270e66a79d2ace667d79604f35bc9c69de4;hpb=d1db495ddf466c47f635ac78eec9229ecfa24722;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index ad706270e..35c7a91f9 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -23,12 +23,15 @@
 #include <vector>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
+#include "dcpomatic_time.h"
+#include "position.h"
 
 class Content;
 class VideoContent;
 class AudioContent;
 class SubtitleContent;
+class FFmpegContent;
 class AudioBuffers;
 
 /** The version number of the protocol used to communicate
@@ -37,36 +40,41 @@ class AudioBuffers;
  */
 #define SERVER_LINK_VERSION 1
 
-typedef int64_t Time;
-#define TIME_MAX INT64_MAX
-#define TIME_HZ	 ((Time) 96000)
-typedef int64_t OutputAudioFrame;
-typedef int	OutputVideoFrame;
 typedef std::vector<boost::shared_ptr<Content> > ContentList;
 typedef std::vector<boost::shared_ptr<VideoContent> > VideoContentList;
 typedef std::vector<boost::shared_ptr<AudioContent> > AudioContentList;
 typedef std::vector<boost::shared_ptr<SubtitleContent> > SubtitleContentList;
+typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
 
-template<class T>
+typedef int64_t VideoFrame;
+typedef int64_t AudioFrame;
+
+/* XXX -> DCPAudio */
 struct TimedAudioBuffers
 {
 	TimedAudioBuffers ()
 		: time (0)
 	{}
 	
-	TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, T t)
+	TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, DCPTime t)
 		: audio (a)
 		, time (t)
 	{}
 	
 	boost::shared_ptr<AudioBuffers> audio;
-	T time;
+	DCPTime time;
 };
 
 enum VideoFrameType
 {
 	VIDEO_FRAME_TYPE_2D,
-	VIDEO_FRAME_TYPE_3D_LEFT_RIGHT
+	VIDEO_FRAME_TYPE_3D_LEFT_RIGHT,
+	VIDEO_FRAME_TYPE_3D_TOP_BOTTOM,
+	VIDEO_FRAME_TYPE_3D_ALTERNATE,
+	/** This content is all the left frames of some 3D */
+	VIDEO_FRAME_TYPE_3D_LEFT,
+	/** This content is all the right frames of some 3D */
+	VIDEO_FRAME_TYPE_3D_RIGHT
 };
 
 enum Eyes
@@ -94,7 +102,7 @@ struct Crop
 	/** Number of pixels to remove from the bottom */
 	int bottom;
 
-	libdcp::Size apply (libdcp::Size s, int minimum = 4) const {
+	dcp::Size apply (dcp::Size s, int minimum = 4) const {
 		s.width -= left + right;
 		s.height -= top + bottom;