Clean up after previous commit.

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

diff --git a/src/lib/types.h b/src/lib/types.h
index 8f99b8881ffe0efec990721dee7ca7751c0a292f..3337087ebfb71e630f30fd0d723629d857548fb8 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 CaptionContent;
 class FFmpegContent;
 
 namespace cxml {
@@ -80,6 +80,8 @@ namespace xmlpp {
 #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;
@@ -127,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.
  */
@@ -134,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;