X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=9801ef5578c3efc5a105bc925b583333d9602ef0;hb=94d5ba335224db075a95a76654f732ef54a4eabd;hp=c9f68a21cdf67d6e5e32c7f44d2ad76ff8f8fff5;hpb=92784c9c28c48859578cd6e75aa01d5657d0c341;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index c9f68a21c..9801ef557 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,35 +18,33 @@
 
 */
 
+
 #ifndef DCPOMATIC_TYPES_H
 #define DCPOMATIC_TYPES_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;
 class AudioContent;
 class TextContent;
 class FFmpegContent;
 
-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.  v2 uses 64+n
+ *
+ *  64 - first version used
+ *  65 - v2.16.0 - checksums added to communication
  */
-#define SERVER_LINK_VERSION (64+0)
+#define SERVER_LINK_VERSION (64+1)
 
 /** A film of F seconds at f FPS will be Ff frames;
     Consider some delta FPS d, so if we run the same
@@ -83,64 +81,35 @@ namespace xmlpp {
 /** Port on which player listens for play requests */
 #define PLAYER_PLAY_PORT (Config::instance()->server_port_base()+5)
 
-typedef std::vector<boost::shared_ptr<Content> > ContentList;
-typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
+typedef std::vector<std::shared_ptr<Content>> ContentList;
+typedef std::vector<std::shared_ptr<FFmpegContent>> FFmpegContentList;
 
 typedef int64_t Frame;
 
-enum VideoFrameType
-{
-	VIDEO_FRAME_TYPE_2D,
-	/** `True' 3D content, e.g. 3D DCPs */
-	VIDEO_FRAME_TYPE_3D,
-	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
-};
-
-std::string video_frame_type_to_string (VideoFrameType);
-VideoFrameType string_to_video_frame_type (std::string);
-
-enum Eyes
+enum class Eyes
 {
-	EYES_BOTH,
-	EYES_LEFT,
-	EYES_RIGHT,
-	EYES_COUNT
+	BOTH,
+	LEFT,
+	RIGHT,
+	COUNT
 };
 
-enum Part
+enum class Part
 {
-	PART_LEFT_HALF,
-	PART_RIGHT_HALF,
-	PART_TOP_HALF,
-	PART_BOTTOM_HALF,
-	PART_WHOLE
+	LEFT_HALF,
+	RIGHT_HALF,
+	TOP_HALF,
+	BOTTOM_HALF,
+	WHOLE
 };
 
-enum ReelType
+enum class ReelType
 {
-	REELTYPE_SINGLE,
-	REELTYPE_BY_VIDEO_CONTENT,
-	REELTYPE_BY_LENGTH
+	SINGLE,
+	BY_VIDEO_CONTENT,
+	BY_LENGTH
 };
 
-enum ChangeType
-{
-	CHANGE_TYPE_PENDING,
-	CHANGE_TYPE_DONE,
-	CHANGE_TYPE_CANCELLED
-};
-
-enum VideoRange
-{
-	VIDEO_RANGE_FULL, ///< full,  or "JPEG" (0-255 for 8-bit)
-	VIDEO_RANGE_VIDEO ///< video, or "MPEG" (16-235 for 8-bit)
-};
 
 /** Type of captions.
  *
@@ -155,62 +124,18 @@ enum VideoRange
  *  There is some use of the word `subtitle' in the code which may mean
  *  caption in some contexts.
  */
-enum TextType
+enum class TextType
 {
-	TEXT_UNKNOWN,
-	TEXT_OPEN_SUBTITLE,
-	TEXT_CLOSED_CAPTION,
-	TEXT_COUNT
+	UNKNOWN,
+	OPEN_SUBTITLE,
+	CLOSED_CAPTION,
+	COUNT
 };
 
 extern std::string text_type_to_string (TextType t);
 extern std::string text_type_to_name (TextType t);
 extern TextType string_to_text_type (std::string s);
 
-enum ExportFormat
-{
-	EXPORT_FORMAT_PRORES,
-	EXPORT_FORMAT_H264
-};
-
-/** @struct Crop
- *  @brief A description of the crop of an image or video.
- */
-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) {}
-	explicit Crop (boost::shared_ptr<cxml::Node>);
-
-	/** Number of pixels to remove from the left-hand side */
-	int left;
-	/** Number of pixels to remove from the right-hand side */
-	int right;
-	/** Number of pixels to remove from the top */
-	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;
-};
-
-extern bool operator== (Crop const & a, Crop const & b);
-extern bool operator!= (Crop const & a, Crop const & b);
 
 struct CPLSummary
 {
@@ -227,31 +152,24 @@ struct CPLSummary
 
 	std::string dcp_directory;
 	std::string cpl_id;
-	std::string cpl_annotation_text;
+	boost::optional<std::string> cpl_annotation_text;
 	boost::filesystem::path cpl_file;
 	/** true if this CPL has any encrypted assets */
 	bool encrypted;
 	time_t last_write_time;
 };
 
-enum Resolution {
-	RESOLUTION_2K,
-	RESOLUTION_4K
+enum class FileTransferProtocol {
+	SCP,
+	FTP
 };
 
-std::string resolution_to_string (Resolution);
-Resolution string_to_resolution (std::string);
-
-enum FileTransferProtocol {
-	FILE_TRANSFER_PROTOCOL_SCP,
-	FILE_TRANSFER_PROTOCOL_FTP
+enum class EmailProtocol {
+	AUTO,
+	PLAIN,
+	STARTTLS,
+	SSL
 };
 
-enum EmailProtocol {
-	EMAIL_PROTOCOL_AUTO,
-	EMAIL_PROTOCOL_PLAIN,
-	EMAIL_PROTOCOL_STARTTLS,
-	EMAIL_PROTOCOL_SSL
-};
 
 #endif