Bump version

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

diff --git a/src/lib/types.h b/src/lib/types.h
index d4d66387d0c5c17c08183b1f04aecfe6ce2cebff..c255bd0d8a43acd6c80a9a5a38f4040fa0e82dca 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -26,6 +26,10 @@
 #include <libdcp/util.h>
 
 class Content;
+class VideoContent;
+class AudioContent;
+class SubtitleContent;
+class FFmpegContent;
 class AudioBuffers;
 
 /** The version number of the protocol used to communicate
@@ -40,6 +44,10 @@ typedef int64_t Time;
 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>
 struct TimedAudioBuffers
@@ -60,7 +68,13 @@ struct TimedAudioBuffers
 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