X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=ccb47dc6477bfa27edef8337b5baff878d48b348;hb=7c730205e50014347bd96ab9735346d0b5922798;hp=ab51e38a9d7a1f8dabd3f749847928b36450bdf9;hpb=6a18a737ef8dfbfbe909afe8266f104a2125b5fb;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index ab51e38a9..ccb47dc64 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -31,7 +31,7 @@
 class Content;
 class VideoContent;
 class AudioContent;
-class SubtitleContent;
+class TextContent;
 class FFmpegContent;
 
 namespace cxml {
@@ -70,6 +70,19 @@ namespace xmlpp {
 */
 #define VIDEO_FRAME_RATE_EPSILON (1e-4)
 
+/** Port on which EncodeServer listens for frame encoding requests */
+#define ENCODE_FRAME_PORT (Config::instance()->server_port_base())
+/** Port on which EncodeServer listens for DCPOMATIC_HELLO from masters */
+#define HELLO_PORT (Config::instance()->server_port_base()+1)
+/** Port on which EncodeServerFinder in the main DCP-o-matic listens for replies to DCPOMATIC_HELLO from servers */
+#define MAIN_SERVER_PRESENCE_PORT (Config::instance()->server_port_base()+2)
+/** Port on which EncodeServerFinder in the batch converter listens for replies to DCPOMATIC_HELLO from servers */
+#define BATCH_SERVER_PRESENCE_PORT (Config::instance()->server_port_base()+3)
+/** Port on which batch converter listens for job requests */
+#define BATCH_JOB_PORT (Config::instance()->server_port_base()+4)
+/** 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;
 
@@ -78,6 +91,8 @@ 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,
@@ -87,6 +102,9 @@ enum VideoFrameType
 	VIDEO_FRAME_TYPE_3D_RIGHT
 };
 
+std::string video_frame_type_to_string (VideoFrameType);
+VideoFrameType string_to_video_frame_type (std::string);
+
 enum Eyes
 {
 	EYES_BOTH,
@@ -111,6 +129,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.
+ *
+ *  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 some use of the word `subtitle' in the code which may mean
+ *  caption in some contexts.
+ */
+enum TextType
+{
+	TEXT_UNKNOWN,
+	TEXT_OPEN_SUBTITLE,
+	TEXT_CLOSED_CAPTION,
+	TEXT_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_AAC,
+	EXPORT_FORMAT_H264_PCM
+};
+
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
  */
@@ -118,7 +181,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>);
+	explicit Crop (boost::shared_ptr<cxml::Node>);
 
 	/** Number of pixels to remove from the left-hand side */
 	int left;
@@ -147,24 +210,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
@@ -173,9 +243,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