X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=35c7a91f9785865e1dada8d2449fa725f4149ae4;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=5e48269189d43b8e7658ecf02be2c1c561874b16;hpb=bdbddbe89d4996a39dc6e695f23a6457c03774ae;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index 5e4826918..35c7a91f9 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -21,15 +21,69 @@
 #define DCPOMATIC_TYPES_H
 
 #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;
+
+/** The version number of the protocol used to communicate
+ *  with servers.  Intended to be bumped when incompatibilities
+ *  are introduced.
+ */
+#define SERVER_LINK_VERSION 1
 
 typedef std::vector<boost::shared_ptr<Content> > ContentList;
-typedef int64_t ContentAudioFrame;
-typedef int ContentVideoFrame;
-typedef double Time;
+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;
+
+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,
+	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
+{
+	EYES_BOTH,
+	EYES_LEFT,
+	EYES_RIGHT,
+	EYES_COUNT
+};
 
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
@@ -37,6 +91,7 @@ typedef double Time;
 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) {}
 
 	/** Number of pixels to remove from the left-hand side */
 	int left;
@@ -46,67 +101,32 @@ struct Crop
 	int top;
 	/** Number of pixels to remove from the bottom */
 	int bottom;
-};
-
-extern bool operator== (Crop const & a, Crop const & b);
-extern bool operator!= (Crop const & a, Crop const & b);
-
-/** @struct Position
- *  @brief A position.
- */
-struct Position
-{
-	Position ()
-		: x (0)
-		, y (0)
-	{}
-
-	Position (int x_, int y_)
-		: x (x_)
-		, y (y_)
-	{}
-
-	/** x coordinate */
-	int x;
-	/** y coordinate */
-	int y;
-};
-
-/** @struct Rect
- *  @brief A rectangle.
- */
-struct Rect
-{
-	Rect ()
-		: x (0)
-		, y (0)
-		, width (0)
-		, height (0)
-	{}
 
-	Rect (int x_, int y_, int w_, int h_)
-		: x (x_)
-		, y (y_)
-		, width (w_)
-		, height (h_)
-	{}
+	dcp::Size apply (dcp::Size s, int minimum = 4) const {
+		s.width -= left + right;
+		s.height -= top + bottom;
 
-	int x;
-	int y;
-	int width;
-	int height;
-
-	Position position () const {
-		return Position (x, y);
-	}
+		if (s.width < minimum) {
+			s.width = minimum;
+		}
 
-	libdcp::Size size () const {
-		return libdcp::Size (width, height);
+		if (s.height < minimum) {
+			s.height = minimum;
+		}
+		
+		return s;
 	}
+};
 
-	Rect intersection (Rect const & other) const;
+extern bool operator== (Crop const & a, Crop const & b);
+extern bool operator!= (Crop const & a, Crop const & b);
 
-	bool contains (Position) const;
+enum Resolution {
+	RESOLUTION_2K,
+	RESOLUTION_4K
 };
 
+std::string resolution_to_string (Resolution);
+Resolution string_to_resolution (std::string);
+
 #endif