X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=94e101a3d682a43127eec28667c54bbe1ffb24bc;hp=6a05f66c93c190b2d7c4e75fa2eebf411bfee385;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=dea824f6ff41384a5e17e23de5434cf84eccff29

diff --git a/src/lib/types.h b/src/lib/types.h
index 6a05f66c9..94e101a3d 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -31,7 +31,7 @@
 class Content;
 class VideoContent;
 class AudioContent;
-class CaptionContent;
+class TextContent;
 class FFmpegContent;
 
 namespace cxml {
@@ -129,26 +129,43 @@ enum ReelType
 	REELTYPE_BY_LENGTH
 };
 
+enum ChangeType
+{
+	CHANGE_TYPE_PENDING,
+	CHANGE_TYPE_DONE,
+	CHANGE_TYPE_CANCELLED
+};
+
 /** 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 CaptionType
+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 (CaptionType t);
-extern std::string caption_type_to_name (CaptionType t);
-extern CaptionType 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
+};
 
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
@@ -186,24 +203,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 +236,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