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

diff --git a/src/lib/types.h b/src/lib/types.h
index 924279c25..b0e9e51ac 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -20,10 +20,13 @@
 #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>
 #include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <libdcp/util.h>
 
 class Content;
 class VideoContent;
@@ -32,45 +35,38 @@ class SubtitleContent;
 class FFmpegContent;
 class AudioBuffers;
 
+namespace cxml {
+	class Node;
+}
+
+namespace xmlpp {
+	class Node;
+}
+
 /** 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 1
-
-typedef int64_t DCPTime;
-#define TIME_MAX INT64_MAX
-#define TIME_HZ	 ((DCPTime) 96000)
-typedef int64_t ContentTime;
-typedef int64_t AudioFrame;
-typedef int	VideoFrame;
+#define SERVER_LINK_VERSION (64+0)
+
 typedef std::vector<boost::shared_ptr<Content> > ContentList;
 typedef std::vector<boost::shared_ptr<VideoContent> > VideoContentList;
 typedef std::vector<boost::shared_ptr<AudioContent> > AudioContentList;
 typedef std::vector<boost::shared_ptr<SubtitleContent> > SubtitleContentList;
 typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
 
-template<class T>
-struct TimedAudioBuffers
-{
-	TimedAudioBuffers ()
-		: time (0)
-	{}
-	
-	TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, T t)
-		: audio (a)
-		, time (t)
-	{}
-	
-	boost::shared_ptr<AudioBuffers> audio;
-	T time;
-};
+typedef int64_t Frame;
 
 enum VideoFrameType
 {
 	VIDEO_FRAME_TYPE_2D,
 	VIDEO_FRAME_TYPE_3D_LEFT_RIGHT,
-	VIDEO_FRAME_TYPE_3D_TOP_BOTTOM
+	VIDEO_FRAME_TYPE_3D_TOP_BOTTOM,
+	VIDEO_FRAME_TYPE_3D_ALTERNATE,
+	/** This content is all the left frames of some 3D */
+	VIDEO_FRAME_TYPE_3D_LEFT,
+	/** This content is all the right frames of some 3D */
+	VIDEO_FRAME_TYPE_3D_RIGHT
 };
 
 enum Eyes
@@ -81,6 +77,15 @@ enum Eyes
 	EYES_COUNT
 };
 
+enum Part
+{
+	PART_LEFT_HALF,
+	PART_RIGHT_HALF,
+	PART_TOP_HALF,
+	PART_BOTTOM_HALF,
+	PART_WHOLE
+};
+
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
  */
@@ -88,6 +93,7 @@ struct Crop
 {
 	Crop () : left (0), right (0), top (0), bottom (0) {}
 	Crop (int l, int r, int t, int b) : left (l), right (r), top (t), bottom (b) {}
+	Crop (boost::shared_ptr<cxml::Node>);
 
 	/** Number of pixels to remove from the left-hand side */
 	int left;
@@ -98,7 +104,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;
 
@@ -109,9 +115,26 @@ struct Crop
 		if (s.height < minimum) {
 			s.height = minimum;
 		}
-		
+
 		return s;
 	}
+
+	void as_xml (xmlpp::Node *) const;
+};
+
+struct CPLSummary
+{
+	CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f)
+		: dcp_directory (d)
+		, cpl_id (i)
+		, cpl_annotation_text (a)
+		, cpl_file (f)
+	{}
+
+	std::string dcp_directory;
+	std::string cpl_id;
+	std::string cpl_annotation_text;
+	boost::filesystem::path cpl_file;
 };
 
 extern bool operator== (Crop const & a, Crop const & b);