X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=a1b40f29939c87a050dd9f4a04cd85f591de8c0b;hb=c28b3d6f168607aca9995282b96647eb64a26dc9;hp=96b993a8e15866b4674324735e05cdadd968f2f7;hpb=eb1a65ba718c15a831d6c99a9bf1a51998aa4f9a;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index 96b993a8e..a1b40f299 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -38,11 +38,12 @@ class AudioBuffers;
  */
 #define SERVER_LINK_VERSION 1
 
-typedef int64_t Time;
+typedef int64_t DCPTime;
 #define TIME_MAX INT64_MAX
-#define TIME_HZ	 ((Time) 96000)
-typedef int64_t OutputAudioFrame;
-typedef int	OutputVideoFrame;
+#define TIME_HZ	 ((DCPTime) 96000)
+typedef int64_t ContentTime;
+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;
@@ -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;