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/content.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/lib/content.h b/src/lib/content.h
index d84f636fb..850cb0891 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -182,10 +182,10 @@ public:
 
 	boost::shared_ptr<VideoContent> video;
 	boost::shared_ptr<AudioContent> audio;
-	std::list<boost::shared_ptr<CaptionContent> > caption;
+	std::list<boost::shared_ptr<TextContent> > caption;
 
-	boost::shared_ptr<CaptionContent> only_caption () const;
-	boost::shared_ptr<CaptionContent> caption_of_original_type (CaptionType type) const;
+	boost::shared_ptr<TextContent> only_caption () const;
+	boost::shared_ptr<TextContent> caption_of_original_type (TextType type) const;
 
 	void signal_changed (int);
 
-- 
cgit v1.2.3