X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=d0f4ec1f8955d20421aecabda5a1b720849be6eb;hp=f554c4dd9ad1f72dc0094fb625eed35c116e0aad;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=0a63f7e9dd20f804a625b7f4fcbaa0cedc4619df

diff --git a/src/lib/types.h b/src/lib/types.h
index f554c4dd9..d0f4ec1f8 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_TYPES_H
 #define DCPOMATIC_TYPES_H
 
-#include "dcpomatic_time.h"
 #include "position.h"
+#include "rect.h"
 #include <dcp/util.h>
 #include <boost/shared_ptr.hpp>
 #include <vector>
@@ -32,7 +32,6 @@ class VideoContent;
 class AudioContent;
 class SubtitleContent;
 class FFmpegContent;
-class AudioBuffers;
 
 namespace cxml {
 	class Node;
@@ -44,9 +43,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,8 +53,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;
+typedef int64_t Frame;
 
 enum VideoFrameType
 {
@@ -115,7 +113,7 @@ struct Crop
 		if (s.height < minimum) {
 			s.height = minimum;
 		}
-		
+
 		return s;
 	}
 
@@ -130,7 +128,7 @@ struct CPLSummary
 		, cpl_annotation_text (a)
 		, cpl_file (f)
 	{}
-	
+
 	std::string dcp_directory;
 	std::string cpl_id;
 	std::string cpl_annotation_text;
@@ -148,4 +146,9 @@ enum Resolution {
 std::string resolution_to_string (Resolution);
 Resolution string_to_resolution (std::string);
 
+enum Protocol {
+	PROTOCOL_SCP,
+	PROTOCOL_FTP
+};
+
 #endif