X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=50eed9aa1033debe460be604cfb4421a480c5461;hb=001ba1644fc6aa54f91fcaaa62ae7e5de2313bc1;hp=6e3732d3112ce2c1092291a69a22b717eb2f74a0;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index 6e3732d31..50eed9aa1 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -45,8 +45,11 @@ namespace xmlpp {
 /** 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
@@ -129,26 +132,51 @@ enum ReelType
 	REELTYPE_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.
- *  For better or worse DoM has uses two names for text that appears
- *  with the DCP:
  *
- *  open captions:   text that is shown to everybody on-screen (aka subtitles).
- *  closed captions: text that is shown to some viewers using some other method.
+ *  The generally accepted definitions seem to be:
+ *  - subtitles: text for an audience who doesn't speak the film's language
+ *  - captions:  text for a hearing-impaired audience
+ *  - open:      on-screen
+ *  - closed:    only visible by some audience members
+ *
+ *  At the moment DoM supports open subtitles and closed captions.
  *
- *  There is also still use of the word `subtitle' in the code; these are the
- *  same as open captions in DoM.
+ *  There is some use of the word `subtitle' in the code which may mean
+ *  caption in some contexts.
  */
 enum TextType
 {
-	CAPTION_OPEN,
-	CAPTION_CLOSED,
-	CAPTION_COUNT
+	TEXT_UNKNOWN,
+	TEXT_OPEN_SUBTITLE,
+	TEXT_CLOSED_CAPTION,
+	TEXT_COUNT
 };
 
-extern std::string caption_type_to_string (TextType t);
-extern std::string caption_type_to_name (TextType t);
-extern TextType string_to_caption_type (std::string s);
+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_AAC,
+	EXPORT_FORMAT_H264_PCM,
+	EXPORT_FORMAT_SUBTITLES_DCP
+};
 
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
@@ -186,24 +214,31 @@ struct Crop
 	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
 {
-	CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f)
+	CPLSummary (boost::filesystem::path p);
+
+	CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f, bool e, time_t t)
 		: dcp_directory (d)
 		, cpl_id (i)
 		, cpl_annotation_text (a)
 		, cpl_file (f)
+		, encrypted (e)
+		, last_write_time (t)
 	{}
 
 	std::string dcp_directory;
 	std::string cpl_id;
 	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;
 };
 
-extern bool operator== (Crop const & a, Crop const & b);
-extern bool operator!= (Crop const & a, Crop const & b);
-
 enum Resolution {
 	RESOLUTION_2K,
 	RESOLUTION_4K
@@ -212,9 +247,16 @@ enum Resolution {
 std::string resolution_to_string (Resolution);
 Resolution string_to_resolution (std::string);
 
-enum Protocol {
-	PROTOCOL_SCP,
-	PROTOCOL_FTP
+enum FileTransferProtocol {
+	FILE_TRANSFER_PROTOCOL_SCP,
+	FILE_TRANSFER_PROTOCOL_FTP
+};
+
+enum EmailProtocol {
+	EMAIL_PROTOCOL_AUTO,
+	EMAIL_PROTOCOL_PLAIN,
+	EMAIL_PROTOCOL_STARTTLS,
+	EMAIL_PROTOCOL_SSL
 };
 
 #endif