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/decoder.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/decoder.cc')

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 2fddddc91..52949a098 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -21,7 +21,7 @@
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "caption_decoder.h"
+#include "text_decoder.h"
 #include <boost/optional.hpp>
 #include <iostream>
 
@@ -43,7 +43,7 @@ Decoder::position () const
 		pos = audio->position();
 	}
 
-	BOOST_FOREACH (shared_ptr<CaptionDecoder> i, caption) {
+	BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) {
 		if (!i->ignore() && (!pos || i->position() < *pos)) {
 			pos = i->position();
 		}
@@ -61,17 +61,17 @@ Decoder::seek (ContentTime, bool)
 	if (audio) {
 		audio->seek ();
 	}
-	BOOST_FOREACH (shared_ptr<CaptionDecoder> i, caption) {
+	BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) {
 		i->seek ();
 	}
 }
 
-shared_ptr<CaptionDecoder>
+shared_ptr<TextDecoder>
 Decoder::only_caption () const
 {
 	DCPOMATIC_ASSERT (caption.size() < 2);
 	if (caption.empty ()) {
-		return shared_ptr<CaptionDecoder> ();
+		return shared_ptr<TextDecoder> ();
 	}
 	return caption.front ();
 }
-- 
cgit v1.2.3