Add player DCP directory to config.

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

diff --git a/src/lib/types.h b/src/lib/types.h
index b2bff78fa67f23a6e4c70e05ffe6315cacb02321..607c9e275098ba840af9395bbfbe7b979afee55c 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -31,7 +31,7 @@
 class Content;
 class VideoContent;
 class AudioContent;
-class CaptionContent;
+class TextContent;
 class FFmpegContent;
 
 namespace cxml {
@@ -129,25 +129,43 @@ enum ReelType
        REELTYPE_BY_LENGTH
 };
 
+enum ChangeType
+{
+       CHANGE_TYPE_PENDING,
+       CHANGE_TYPE_DONE,
+       CHANGE_TYPE_CANCELLED
+};
+
 /** 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.
+ *  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 also still use of the word `subtitle' in the code; these are the
- *  same as open captions in DoM.
+ *  There is some use of the word `subtitle' in the code which may mean
+ *  caption in some contexts.
  */
-enum CaptionType
+enum TextType
 {
-       CAPTION_OPEN,
-       CAPTION_CLOSED,
-       CAPTION_COUNT
+       TEXT_UNKNOWN,
+       TEXT_OPEN_SUBTITLE,
+       TEXT_CLOSED_CAPTION,
+       TEXT_COUNT
 };
 
-extern std::string caption_type_to_string (CaptionType t);
-extern CaptionType string_to_caption_type (std::string s);
+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
+};
 
 /** @struct Crop
  *  @brief A description of the crop of an image or video.