X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=e7017a2950c7b79fdfe20ee89d724badf53f4a23;hb=61bafeda23d9e849f636ac416a745b0ab28bc103;hp=9a6a30b861d45344325507186f5c08b2b200ea42;hpb=c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index 9a6a30b86..e7017a295 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;
@@ -57,22 +58,6 @@ 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;
-};
-
 enum VideoFrameType
 {
 	VIDEO_FRAME_TYPE_2D,