Some subtitle renaming.

6 files changed, 15 insertions, 15 deletions

diff --git a/src/lib/active_text.cc b/src/lib/active_text.cc
index 6e813144c..5f4440728 100644
--- a/src/lib/active_text.cc
+++ b/src/lib/active_text.cc
@@ -144,7 +144,7 @@ ActiveText::add_to (weak_ptr<const TextContent> content, DCPTime to)
 
 	_data[content].back().to = to;
 
-	BOOST_FOREACH (StringText& i, _data[content].back().subs.text) {
+	BOOST_FOREACH (StringText& i, _data[content].back().subs.string) {
 		i.set_out (dcp::Time(to.seconds(), 1000));
 	}
 
diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 943991d2b..8979b6b4c 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -287,8 +287,8 @@ Hints::text (PlayerText text, TextType type, DCPTimePeriod period)
 		return;
 	}
 
-	int lines = text.text.size();
-	BOOST_FOREACH (StringText i, text.text) {
+	int lines = text.string.size();
+	BOOST_FOREACH (StringText i, text.string) {
 		if (i.text().length() > CLOSED_CAPTION_LENGTH) {
 			++lines;
 			if (!_long_ccap) {
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 408e791cd..68b3365ea 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -745,13 +745,13 @@ Player::open_subtitles_for_frame (DCPTime time) const
 		_active_texts[TEXT_OPEN_SUBTITLE].get_burnt(DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_open_subtitles)
 		) {
 
-		/* Image subtitles */
-		list<PositionImage> c = transform_bitmap_texts (j.image);
+		/* Bitmap subtitles */
+		list<PositionImage> c = transform_bitmap_texts (j.bitmap);
 		copy (c.begin(), c.end(), back_inserter (captions));
 
-		/* Text subtitles (rendered to an image) */
-		if (!j.text.empty ()) {
-			list<PositionImage> s = render_text (j.text, j.fonts, _video_container_size, time, vfr);
+		/* String subtitles (rendered to an image) */
+		if (!j.string.empty ()) {
+			list<PositionImage> s = render_text (j.string, j.fonts, _video_container_size, time, vfr);
 			copy (s.begin(), s.end(), back_inserter (captions));
 		}
 	}
@@ -940,7 +940,7 @@ Player::bitmap_text_start (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, C
 	subtitle.sub.rectangle.height *= text->y_scale ();
 
 	PlayerText ps;
-	ps.image.push_back (subtitle.sub);
+	ps.bitmap.push_back (subtitle.sub);
 	DCPTime from (content_time_to_dcp (piece, subtitle.from()));
 
 	_active_texts[subtitle.type()].add_from (wc, ps, from);
@@ -983,7 +983,7 @@ Player::plain_text_start (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, Co
 		}
 
 		s.set_in (dcp::Time(from.seconds(), 1000));
-		ps.text.push_back (StringText (s, text->outline_width()));
+		ps.string.push_back (StringText (s, text->outline_width()));
 		ps.add_fonts (text->fonts ());
 	}
 
diff --git a/src/lib/player_text.h b/src/lib/player_text.h
index 5a8799116..3f5066314 100644
--- a/src/lib/player_text.h
+++ b/src/lib/player_text.h
@@ -35,8 +35,8 @@ public:
 	std::list<boost::shared_ptr<Font> > fonts;
 
 	/** BitmapTexts, with their rectangles transformed as specified by their content */
-	std::list<BitmapText> image;
-	std::list<StringText> text;
+	std::list<BitmapText> bitmap;
+	std::list<StringText> string;
 };
 
 #endif
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 2561e556a..f9e3471a8 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -573,14 +573,14 @@ ReelWriter::write (PlayerText subs, TextType type, DCPTimePeriod period)
 		}
 	}
 
-	BOOST_FOREACH (StringText i, subs.text) {
+	BOOST_FOREACH (StringText i, subs.string) {
 		/* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */
 		i.set_in  (i.in()  - dcp::Time (_period.from.seconds(), i.in().tcr));
 		i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr));
 		_caption_asset[type]->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
 	}
 
-	BOOST_FOREACH (BitmapText i, subs.image) {
+	BOOST_FOREACH (BitmapText i, subs.bitmap) {
 		_caption_asset[type]->add (
 			shared_ptr<dcp::Subtitle>(
 				new dcp::SubtitleImage(
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index ea7db88f0..a504cade9 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -104,7 +104,7 @@ ClosedCaptionsDialog::update (DCPTime time)
 	DCPOMATIC_ASSERT (player);
 	list<StringText> to_show;
 	BOOST_FOREACH (PlayerText i, player->closed_captions_for_frame(time)) {
-		BOOST_FOREACH (StringText j, i.text) {
+		BOOST_FOREACH (StringText j, i.string) {
 			to_show.push_back (j);
 		}
 	}