X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftypes.h;h=22d652b3f74e47d42c4cce22a0eaa2bf6c706c11;hb=9d045fa4e19d6b9a3f2ffcd67a5b69de823595e6;hp=b2bff78fa67f23a6e4c70e05ffe6315cacb02321;hpb=cbd4450197a083bf58bda510e626f73ba583cb66;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index b2bff78fa..22d652b3f 100644
--- 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,37 @@ 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);
 
 /** @struct Crop
  *  @brief A description of the crop of an image or video.