More automated renaming.

[dcpomatic.git] / src / lib / types.h

diff --git a/src/lib/types.h b/src/lib/types.h
index 0702c873405c07a823bb13ccbe03150052bf6fe4..6e3732d3112ce2c1092291a69a22b717eb2f74a0 100644 (file)
--- 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 {
@@ -74,10 +74,14 @@ namespace xmlpp {
 #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 listens for replies to DCPOMATIC_HELLO from servers */
-#define SERVER_PRESENCE_PORT (Config::instance()->server_port_base()+2)
+/** 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()+3)
+#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;
@@ -125,6 +129,27 @@ enum ReelType
        REELTYPE_BY_LENGTH
 };
 
+/** 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.
+ *
+ *  There is also still use of the word `subtitle' in the code; these are the
+ *  same as open captions in DoM.
+ */
+enum TextType
+{
+       CAPTION_OPEN,
+       CAPTION_CLOSED,
+       CAPTION_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);
+
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
  */
@@ -132,7 +157,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;