X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=9a6a30b861d45344325507186f5c08b2b200ea42;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=01560ba81fdedbd9eb643a816adb002b45acaace;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index 01560ba81..9a6a30b86 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -23,44 +23,66 @@
 #include <vector>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
+#include "dcpomatic_time.h"
+#include "position.h"
 
 class Content;
+class VideoContent;
+class AudioContent;
+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.
  */
-#define SERVER_LINK_VERSION 1
+#define SERVER_LINK_VERSION 2
 
-typedef int64_t Time;
-#define TIME_MAX INT64_MAX
-#define TIME_HZ	 ((Time) 96000)
-typedef int64_t OutputAudioFrame;
-typedef int	OutputVideoFrame;
 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>
+typedef int64_t VideoFrame;
+typedef int64_t AudioFrame;
+
+/* XXX -> DCPAudio */
 struct TimedAudioBuffers
 {
 	TimedAudioBuffers ()
 		: time (0)
 	{}
 	
-	TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, T t)
+	TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, DCPTime t)
 		: audio (a)
 		, time (t)
 	{}
 	
 	boost::shared_ptr<AudioBuffers> audio;
-	T time;
+	DCPTime time;
 };
 
 enum VideoFrameType
 {
 	VIDEO_FRAME_TYPE_2D,
-	VIDEO_FRAME_TYPE_3D_LEFT_RIGHT
+	VIDEO_FRAME_TYPE_3D_LEFT_RIGHT,
+	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
@@ -71,6 +93,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.
  */
@@ -78,6 +109,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;
@@ -87,6 +119,38 @@ struct Crop
 	int top;
 	/** Number of pixels to remove from the bottom */
 	int bottom;
+
+	dcp::Size apply (dcp::Size s, int minimum = 4) const {
+		s.width -= left + right;
+		s.height -= top + bottom;
+
+		if (s.width < minimum) {
+			s.width = minimum;
+		}
+
+		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);