X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftypes.h;h=a1b40f29939c87a050dd9f4a04cd85f591de8c0b;hb=f58d9e44302151dea9f594acd9fc27a331fa77fb;hp=1ab6a94d4244f18c38ca291e3e546e40ed703f56;hpb=ad10aea1d685e67e0e639f6303fc9c8f8f1f945c;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index 1ab6a94d4..a1b40f299 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -42,8 +42,8 @@ typedef int64_t DCPTime;
 #define TIME_MAX INT64_MAX
 #define TIME_HZ	 ((DCPTime) 96000)
 typedef int64_t ContentTime;
-typedef int64_t OutputAudioFrame;
-typedef int	OutputVideoFrame;
+typedef int64_t AudioFrame;
+typedef int	VideoFrame;
 typedef std::vector<boost::shared_ptr<Content> > ContentList;
 typedef std::vector<boost::shared_ptr<VideoContent> > VideoContentList;
 typedef std::vector<boost::shared_ptr<AudioContent> > AudioContentList;
@@ -69,7 +69,8 @@ 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
 };
 
 enum Eyes
@@ -97,7 +98,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;