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

diff --git a/src/lib/types.h b/src/lib/types.h
index ab51e38a9..5707cf5ce 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,15 @@ enum ReelType
 	REELTYPE_BY_LENGTH
 };
 
+enum TextType
+{
+	TEXT_SUBTITLE,
+	TEXT_CLOSED_CAPTION
+};
+
+extern std::string text_type_to_string (TextType t);
+extern TextType string_to_text_type (std::string s);
+
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
  */
@@ -118,7 +145,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;