X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=b0e9e51aca8314ae0b7769148bc7df49fd564d0a;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=9a6a30b861d45344325507186f5c08b2b200ea42;hpb=73f52e94953848c696725defd3d7f5c4c30707e2;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index 9a6a30b86..b0e9e51ac 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -20,12 +20,13 @@
 #ifndef DCPOMATIC_TYPES_H
 #define DCPOMATIC_TYPES_H
 
-#include <vector>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <dcp/util.h>
 #include "dcpomatic_time.h"
 #include "position.h"
+#include "rect.h"
+#include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
+#include <stdint.h>
 
 class Content;
 class VideoContent;
@@ -44,9 +45,9 @@ namespace xmlpp {
 
 /** The version number of the protocol used to communicate
  *  with servers.  Intended to be bumped when incompatibilities
- *  are introduced.
+ *  are introduced.  v2 uses 64+n
  */
-#define SERVER_LINK_VERSION 2
+#define SERVER_LINK_VERSION (64+0)
 
 typedef std::vector<boost::shared_ptr<Content> > ContentList;
 typedef std::vector<boost::shared_ptr<VideoContent> > VideoContentList;
@@ -54,24 +55,7 @@ typedef std::vector<boost::shared_ptr<AudioContent> > AudioContentList;
 typedef std::vector<boost::shared_ptr<SubtitleContent> > SubtitleContentList;
 typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
 
-typedef int64_t VideoFrame;
-typedef int64_t AudioFrame;
-
-/* XXX -> DCPAudio */
-struct TimedAudioBuffers
-{
-	TimedAudioBuffers ()
-		: time (0)
-	{}
-	
-	TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, DCPTime t)
-		: audio (a)
-		, time (t)
-	{}
-	
-	boost::shared_ptr<AudioBuffers> audio;
-	DCPTime time;
-};
+typedef int64_t Frame;
 
 enum VideoFrameType
 {
@@ -131,7 +115,7 @@ struct Crop
 		if (s.height < minimum) {
 			s.height = minimum;
 		}
-		
+
 		return s;
 	}
 
@@ -146,7 +130,7 @@ struct CPLSummary
 		, cpl_annotation_text (a)
 		, cpl_file (f)
 	{}
-	
+
 	std::string dcp_directory;
 	std::string cpl_id;
 	std::string cpl_annotation_text;