X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Ftypes.h;h=3337087ebfb71e630f30fd0d723629d857548fb8;hb=06b218772cf18041edb11b5ed35c8a305b8fe26a;hp=041db1786ea6c2653eba64c97161898b530a76c7;hpb=78012b8cf9b4c6e35b425c97b6432551ce635c3a;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index 041db1786..3337087eb 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -31,7 +31,7 @@
 class Content;
 class VideoContent;
 class AudioContent;
-class SubtitleContent;
+class CaptionContent;
 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;
 
@@ -116,6 +129,16 @@ enum ReelType
 	REELTYPE_BY_LENGTH
 };
 
+enum CaptionType
+{
+	CAPTION_OPEN,
+	CAPTION_CLOSED,
+	CAPTION_COUNT
+};
+
+extern std::string caption_type_to_string (CaptionType t);
+extern CaptionType string_to_caption_type (std::string s);
+
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
  */
@@ -123,7 +146,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;