From df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 23 Jul 2018 11:20:12 +0100
Subject: More automated renaming.

ActiveCaptions -> ActiveText
BitmapCaption -> BitmapText
ContentCaption -> ContentText
ContentTextCaption -> ContentStringText
TextCaptionFileContent -> StringTextFileContent
TextCaptionFileDecoder -> StringTextFileDecoder
TextCaptionFile -> StringTextFile
TextCaption -> StringText
PlayerCaption -> PlayerText
CaptionContent -> TextContent
CaptionDecoder -> TextDecoder
CaptionPanel -> TextPanel
CaptionView -> TextView
CaptionAppearanceDialog -> SubtitleAppearanceDialog
CaptionType -> TextType
---
 src/lib/types.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/types.h')

diff --git a/src/lib/types.h b/src/lib/types.h
index 6a05f66c9..6e3732d31 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 {
@@ -139,16 +139,16 @@ enum ReelType
  *  There is also still use of the word `subtitle' in the code; these are the
  *  same as open captions in DoM.
  */
-enum CaptionType
+enum TextType
 {
 	CAPTION_OPEN,
 	CAPTION_CLOSED,
 	CAPTION_COUNT
 };
 
-extern std::string caption_type_to_string (CaptionType t);
-extern std::string caption_type_to_name (CaptionType t);
-extern CaptionType string_to_caption_type (std::string s);
+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.
-- 
cgit v1.2.3