From a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 23 Jul 2018 15:10:11 +0100
Subject: Tidy up after mass rename.

---
 src/tools/dcpomatic.cc        | 10 +++++-----
 src/tools/dcpomatic_player.cc |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index a2b55691e..a97e12b69 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -567,7 +567,7 @@ private:
 	{
 		DCPOMATIC_ASSERT (_clipboard);
 
-		PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->caption.empty());
+		PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->text.empty());
 		if (d->ShowModal() == wxID_OK) {
 			BOOST_FOREACH (shared_ptr<Content> i, _film_editor->content_panel()->selected()) {
 				if (d->video() && i->video) {
@@ -579,10 +579,10 @@ private:
 					i->audio->take_settings_from (_clipboard->audio);
 				}
 
-				if (d->caption()) {
-					list<shared_ptr<TextContent> >::iterator j = i->caption.begin ();
-					list<shared_ptr<TextContent> >::const_iterator k = _clipboard->caption.begin ();
-					while (j != i->caption.end() && k != _clipboard->caption.end()) {
+				if (d->text()) {
+					list<shared_ptr<TextContent> >::iterator j = i->text.begin ();
+					list<shared_ptr<TextContent> >::const_iterator k = _clipboard->text.begin ();
+					while (j != i->text.end() && k != _clipboard->text.end()) {
 						(*j)->take_settings_from (*k);
 						++j;
 						++k;
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 44c6b8606..fce069d7e 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -626,7 +626,7 @@ private:
 
 	void setup_from_dcp (shared_ptr<DCPContent> dcp)
 	{
-		BOOST_FOREACH (shared_ptr<TextContent> i, dcp->caption) {
+		BOOST_FOREACH (shared_ptr<TextContent> i, dcp->text) {
 			i->set_use (true);
 		}
 
-- 
cgit v1.2.3