From: Carl Hetherington <cth@carlh.net>
Date: Thu, 23 Aug 2018 09:37:59 +0000 (+0100)
Subject: More caption -> text.
X-Git-Tag: v2.13.45~8
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8855efa208776139bf9ce5a188db080e1e136e9b

More caption -> text.
---

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index a7e3218b5..4b5c5a102 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -96,7 +96,7 @@ Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
 	*/
 	_audio_reel = _reels.begin ();
 	for (int i = 0; i < TEXT_COUNT; ++i) {
-		_caption_reel[i] = _reels.begin ();
+		_text_reel[i] = _reels.begin ();
 	}
 
 	/* Check that the signer is OK if we need one */
@@ -667,14 +667,14 @@ Writer::can_fake_write (Frame frame) const
 void
 Writer::write (PlayerText text, TextType type, DCPTimePeriod period)
 {
-	while (_caption_reel[type]->period().to <= period.from) {
-		++_caption_reel[type];
-		DCPOMATIC_ASSERT (_caption_reel[type] != _reels.end());
+	while (_text_reel[type]->period().to <= period.from) {
+		++_text_reel[type];
+		DCPOMATIC_ASSERT (_text_reel[type] != _reels.end());
 	}
 
-	DCPOMATIC_ASSERT (_caption_reel[type] != _reels.end());
+	DCPOMATIC_ASSERT (_text_reel[type] != _reels.end());
 
-	_caption_reel[type]->write (text, type, period);
+	_text_reel[type]->write (text, type, period);
 }
 
 void
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 8fc0ce29e..484ca1285 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -124,7 +124,7 @@ private:
 	boost::weak_ptr<Job> _job;
 	std::vector<ReelWriter> _reels;
 	std::vector<ReelWriter>::iterator _audio_reel;
-	std::vector<ReelWriter>::iterator _caption_reel[TEXT_COUNT];
+	std::vector<ReelWriter>::iterator _text_reel[TEXT_COUNT];
 
 	/** our thread, or 0 */
 	boost::thread* _thread;