Adapt to some libdcp class renaming to allow open captions/closed subtitles.

13 files changed, 62 insertions, 63 deletions

diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 1a9531f4a..75890f87f 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -26,7 +26,7 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
-#include <dcp/reel_closed_caption_asset.h>
+#include <dcp/reel_text_asset.h>
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 22e4fd9ff..32a1ff98a 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -39,7 +39,7 @@
 #include "test.h"
 #include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/openjpeg_image.h>
-#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/smpte_text_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -280,12 +280,12 @@ BOOST_AUTO_TEST_CASE(entity_from_dcp_source)
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
 		});
 
-	dcp::SMPTESubtitleAsset check(dcp_file(film, "sub_"));
-	auto subs = check.subtitles();
+	dcp::SMPTETextAsset check(dcp_file(film, "sub_"));
+	auto subs = check.texts();
 	BOOST_REQUIRE_EQUAL(subs.size(), 1U);
-	auto sub = std::dynamic_pointer_cast<const dcp::SubtitleString>(subs[0]);
+	auto sub = std::dynamic_pointer_cast<const dcp::TextString>(subs[0]);
 	BOOST_REQUIRE(sub);
-	/* libdcp::SubtitleAsset gets the text from the XML with get_content(), which
+	/* dcp::TextAsset gets the text from the XML with get_content(), which
 	 * resolves the 5 predefined entities & " < > ' so we shouldn't see any
 	 * entity here.
 	 */
diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index 9ff3c3817..e89890542 100644
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -30,7 +30,7 @@
 #include "lib/render_text.h"
 #include "lib/string_text.h"
 #include "test.h"
-#include <dcp/subtitle_string.h>
+#include <dcp/text_string.h>
 #include <pango/pango-utils.h>
 #include <boost/test/unit_test.hpp>
 
@@ -44,7 +44,7 @@ add(std::vector<StringText>& s, std::string text, bool italic, bool bold, bool u
 {
 	s.push_back (
 		StringText (
-			dcp::SubtitleString (
+			dcp::TextString(
 				boost::optional<std::string> (),
 				italic,
 				bold,
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE (marked_up_test6)
 
 BOOST_AUTO_TEST_CASE(render_text_with_newline_test)
 {
-	std::list<dcp::SubtitleString> ss = {
+	std::list<dcp::TextString> ss = {
 		{
 			{}, true, false, false, dcp::Colour(255, 255, 255), 42, 1.0,
 			dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24),
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE(render_text_with_newline_test)
 
 BOOST_AUTO_TEST_CASE (render_text_test)
 {
-	auto dcp_string = dcp::SubtitleString(
+	auto dcp_string = dcp::TextString(
 		{}, false, false, false, dcp::Colour(255, 255, 255), 42, 1.0,
 		dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24),
 		0.5, dcp::HAlign::CENTER,
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 031749a8c..7bfbf1cbe 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -32,8 +32,8 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "test.h"
-#include <dcp/smpte_subtitle_asset.h>
-#include <dcp/subtitle_string.h>
+#include <dcp/smpte_text_asset.h>
+#include <dcp/text_string.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
 #include <list>
@@ -229,12 +229,12 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_entity)
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
 		});
 
-	dcp::SMPTESubtitleAsset check(dcp_file(film, "sub_"));
-	auto subs = check.subtitles();
+	dcp::SMPTETextAsset check(dcp_file(film, "sub_"));
+	auto subs = check.texts();
 	BOOST_REQUIRE_EQUAL(subs.size(), 1U);
-	auto sub = std::dynamic_pointer_cast<const dcp::SubtitleString>(subs[0]);
+	auto sub = std::dynamic_pointer_cast<const dcp::TextString>(subs[0]);
 	BOOST_REQUIRE(sub);
-	/* libdcp::SubtitleAsset gets the text from the XML with get_content(), which
+	/* dcp::TextAsset gets the text from the XML with get_content(), which
 	 * resolves the 5 predefined entities & " < > ' so we shouldn't see any
 	 * entity here.
 	 */
diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index ffd374d45..d21f7c450 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -33,7 +33,7 @@
 #include "lib/text_content.h"
 #include "test.h"
 #include <dcp/equality_options.h>
-#include <dcp/interop_subtitle_asset.h>
+#include <dcp/interop_text_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
 
@@ -63,11 +63,11 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
 
 	make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_STANDARD });
 
-	auto ref = make_shared<dcp::InteropSubtitleAsset>(TestPaths::private_data() / "DKH_UT_EN20160601def.xml");
-	auto check = make_shared<dcp::InteropSubtitleAsset>(subtitle_file(film));
+	auto ref = make_shared<dcp::InteropTextAsset>(TestPaths::private_data() / "DKH_UT_EN20160601def.xml");
+	auto check = make_shared<dcp::InteropTextAsset>(subtitle_file(film));
 
 	dcp::EqualityOptions options;
-	options.max_subtitle_vertical_position_error = 0.1;
+	options.max_text_vertical_position_error = 0.1;
 	BOOST_CHECK(ref->equals(check, options, [](dcp::NoteType t, string n) {
 		if (t == dcp::NoteType::ERROR) {
 			std::cerr << n << "\n";
diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index 9a901727b..b358e7d3e 100644
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -30,8 +30,8 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
-#include <dcp/reel_subtitle_asset.h>
-#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/reel_text_asset.h>
+#include <dcp/smpte_text_asset.h>
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_without_font_tag)
 		});
 
 	auto check_file = subtitle_file(film);
-	dcp::SMPTESubtitleAsset check_asset(check_file);
+	dcp::SMPTETextAsset check_asset(check_file);
 	BOOST_CHECK_EQUAL(check_asset.load_font_nodes().size(), 1U);
 	auto check_font_data = check_asset.font_data();
 	BOOST_CHECK_EQUAL(check_font_data.size(), 1U);
@@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_in_dcp_without_font_tag)
 		});
 
 	auto check_file = subtitle_file(film);
-	dcp::SMPTESubtitleAsset check_asset(check_file);
+	dcp::SMPTETextAsset check_asset(check_file);
 	BOOST_CHECK_EQUAL(check_asset.load_font_nodes().size(), 1U);
 	auto check_font_data = check_asset.font_data();
 	BOOST_CHECK_EQUAL(check_font_data.size(), 1U);
@@ -256,8 +256,8 @@ BOOST_AUTO_TEST_CASE(subtitle_with_no_font_test)
 	BOOST_REQUIRE(check_subs);
 
 	BOOST_CHECK_EQUAL(check_subs->font_data().size(), 1U);
-	BOOST_REQUIRE_EQUAL(check_subs->subtitles().size(), 1U);
-	BOOST_CHECK(!std::dynamic_pointer_cast<const dcp::SubtitleString>(check_subs->subtitles()[0])->font().has_value());
+	BOOST_REQUIRE_EQUAL(check_subs->texts().size(), 1U);
+	BOOST_CHECK(!std::dynamic_pointer_cast<const dcp::TextString>(check_subs->texts()[0])->font().has_value());
 
 	auto check_film = new_test_film(name_base + "_check", { make_shared<DCPContent>(bad_film->dir(bad_film->dcp_name())) });
 	make_and_verify_dcp(check_film);
@@ -289,7 +289,7 @@ BOOST_AUTO_TEST_CASE(use_first_loadfont_as_default)
 	BOOST_REQUIRE(!cpl->reels().empty());
 	auto reel = cpl->reels()[0];
 	BOOST_REQUIRE(reel->main_subtitle()->asset());
-	auto subtitle = std::dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(reel->main_subtitle()->asset());
+	auto subtitle = std::dynamic_pointer_cast<dcp::SMPTETextAsset>(reel->main_subtitle()->asset());
 	BOOST_REQUIRE_EQUAL(subtitle->font_data().size(), 1U);
 	BOOST_CHECK(subtitle->font_data().begin()->second == dcp::ArrayData("test/data/Inconsolata-VF.ttf"));
 }
diff --git a/test/subtitle_position_test.cc b/test/subtitle_position_test.cc
index 9c71b0d70..05e305478 100644
--- a/test/subtitle_position_test.cc
+++ b/test/subtitle_position_test.cc
@@ -25,9 +25,9 @@
 #include "lib/make_dcp.h"
 #include "lib/text_content.h"
 #include "test.h"
-#include <dcp/interop_subtitle_asset.h>
+#include <dcp/interop_text_asset.h>
 #include <dcp/language_tag.h>
-#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/smpte_text_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <vector>
 
@@ -56,8 +56,8 @@ BOOST_AUTO_TEST_CASE(srt_correctly_placed_in_interop)
 
 	auto output = subtitle_file(film);
 
-	dcp::InteropSubtitleAsset asset(output);
-	auto output_subs = asset.subtitles();
+	dcp::InteropTextAsset asset(output);
+	auto output_subs = asset.texts();
 	BOOST_REQUIRE_EQUAL(output_subs.size(), 1U);
 
 	BOOST_CHECK(output_subs[0]->v_align() == dcp::VAlign::BOTTOM);
@@ -84,8 +84,8 @@ BOOST_AUTO_TEST_CASE(srt_correctly_placed_in_smpte)
 
 	auto output = subtitle_file(film);
 
-	dcp::SMPTESubtitleAsset asset(output);
-	auto output_subs = asset.subtitles();
+	dcp::SMPTETextAsset asset(output);
+	auto output_subs = asset.texts();
 	BOOST_REQUIRE_EQUAL(output_subs.size(), 1U);
 
 	BOOST_CHECK(output_subs[0]->v_align() == dcp::VAlign::BOTTOM);
@@ -123,13 +123,13 @@ vpos_test(dcp::VAlign reference, float position, dcp::SubtitleStandard from, dcp
 	BOOST_REQUIRE(!wait_for_jobs());
 
 	auto out = subtitle_file(film);
-	vector<shared_ptr<const dcp::Subtitle>> subtitles;
+	vector<shared_ptr<const dcp::Text>> subtitles;
 	if (to == dcp::Standard::INTEROP) {
-		dcp::InteropSubtitleAsset asset(out);
-		subtitles = asset.subtitles();
+		dcp::InteropTextAsset asset(out);
+		subtitles = asset.texts();
 	} else {
-		dcp::SMPTESubtitleAsset asset(out);
-		subtitles = asset.subtitles();
+		dcp::SMPTETextAsset asset(out);
+		subtitles = asset.texts();
 	}
 
 	BOOST_REQUIRE_EQUAL(subtitles.size(), 1U);
diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index 0648ec477..a74cc097d 100644
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -28,8 +28,8 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
-#include <dcp/interop_subtitle_asset.h>
-#include <dcp/reel_subtitle_asset.h>
+#include <dcp/interop_text_asset.h>
+#include <dcp/reel_text_asset.h>
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
 
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
 	int n = 1;
 	for (auto i: cpl->reels()) {
 		if (i->main_subtitle()) {
-			auto ass = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(i->main_subtitle()->asset());
+			auto ass = dynamic_pointer_cast<dcp::InteropTextAsset>(i->main_subtitle()->asset());
 			BOOST_REQUIRE (ass);
 			BOOST_CHECK_EQUAL (ass->reel_number(), dcp::raw_convert<string>(n));
 			++n;
diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index 8a1a8bece..877709f73 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -27,10 +27,9 @@
 #include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
+#include <dcp/interop_text_asset.h>
 #include <dcp/reel.h>
-#include <dcp/interop_subtitle_asset.h>
-#include <dcp/reel_closed_caption_asset.h>
-#include <dcp/reel_subtitle_asset.h>
+#include <dcp/reel_text_asset.h>
 #include <boost/test/unit_test.hpp>
 
 
@@ -80,19 +79,19 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
 	auto i = reels.begin ();
 	BOOST_REQUIRE ((*i)->main_subtitle());
 	BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-	auto A = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+	auto A = std::dynamic_pointer_cast<dcp::InteropTextAsset>((*i)->main_subtitle()->asset());
 	BOOST_REQUIRE (A);
 	++i;
 	BOOST_REQUIRE ((*i)->main_subtitle());
 	BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-	auto B = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+	auto B = std::dynamic_pointer_cast<dcp::InteropTextAsset>((*i)->main_subtitle()->asset());
 	BOOST_REQUIRE (B);
 
-	BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1U);
-	BOOST_REQUIRE_EQUAL (B->subtitles().size(), 1U);
+	BOOST_REQUIRE_EQUAL(A->texts().size(), 1U);
+	BOOST_REQUIRE_EQUAL(B->texts().size(), 1U);
 
 	/* These times should be the same as they are should be offset from the start of the reel */
-	BOOST_CHECK (A->subtitles().front()->in() == B->subtitles().front()->in());
+	BOOST_CHECK(A->texts().front()->in() == B->texts().front()->in());
 }
 
 
@@ -231,7 +230,7 @@ BOOST_AUTO_TEST_CASE (subtitles_split_at_reel_boundaries)
 		BOOST_REQUIRE (reel_sub);
 		auto sub = reel_sub->asset();
 		BOOST_REQUIRE (sub);
-		BOOST_CHECK_EQUAL (sub->subtitles().size(), 1U);
+		BOOST_CHECK_EQUAL(sub->texts().size(), 1U);
 	}
 }
 
diff --git a/test/subtitle_timing_test.cc b/test/subtitle_timing_test.cc
index 2e6b319cb..0bb678655 100644
--- a/test/subtitle_timing_test.cc
+++ b/test/subtitle_timing_test.cc
@@ -33,7 +33,7 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
-#include <dcp/reel_subtitle_asset.h>
+#include <dcp/reel_text_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change)
 	BOOST_REQUIRE(reel->main_subtitle());
 	BOOST_REQUIRE(reel->main_subtitle()->asset());
 
-	auto subs = reel->main_subtitle()->asset()->subtitles();
+	auto subs = reel->main_subtitle()->asset()->texts();
 	int index = 0;
 	for (auto i: subs) {
 		auto error = std::abs(i->in().as_seconds() - (index * content_frame_rate / dcp_frame_rate));
diff --git a/test/test.cc b/test/test.cc
index acbc97ea1..09085eeea 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -563,7 +563,7 @@ check_dcp(boost::filesystem::path ref, boost::filesystem::path check, bool sound
 	options.reel_hashes_can_differ = true;
 	options.asset_hashes_can_differ = true;
 	options.issue_dates_can_differ = true;
-	options.max_subtitle_vertical_position_error = 0.001;
+	options.max_text_vertical_position_error = 0.001;
 	options.sound_assets_can_differ = sound_can_differ;
 
 	BOOST_CHECK_MESSAGE(ref_dcp.equals(check_dcp, options, boost::bind (note, _1, _2)), check << " does not match " << ref);
diff --git a/test/text_entry_point_test.cc b/test/text_entry_point_test.cc
index b48111782..f748a2680 100644
--- a/test/text_entry_point_test.cc
+++ b/test/text_entry_point_test.cc
@@ -25,8 +25,8 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
-#include <dcp/reel_smpte_subtitle_asset.h>
-#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/reel_smpte_text_asset.h>
+#include <dcp/smpte_text_asset.h>
 #include <boost/test/unit_test.hpp>
 
 
@@ -42,9 +42,9 @@ BOOST_AUTO_TEST_CASE(test_text_entry_point)
 
 	/* Make a "bad" DCP with a non-zero text entry point */
 	dcp::DCP bad_dcp(path / "dcp");
-	auto sub = make_shared<dcp::SMPTESubtitleAsset>();
+	auto sub = make_shared<dcp::SMPTETextAsset>();
 	sub->write(path / "dcp" / "subs.mxf");
-	auto reel_sub = make_shared<dcp::ReelSMPTESubtitleAsset>(sub, dcp::Fraction{24, 1}, 42, 6);
+	auto reel_sub = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, sub, dcp::Fraction{24, 1}, 42, 6);
 	auto reel = make_shared<dcp::Reel>();
 	reel->add(reel_sub);
 
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 589e12d83..0313be1d9 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -45,9 +45,9 @@
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
-#include <dcp/reel_smpte_subtitle_asset.h>
-#include <dcp/smpte_subtitle_asset.h>
-#include <dcp/subtitle_string.h>
+#include <dcp/reel_smpte_text_asset.h>
+#include <dcp/smpte_text_asset.h>
+#include <dcp/text_string.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -454,9 +454,9 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels)
 	auto pic1 = make_picture("pic1.mxf");
 	auto pic2 = make_picture("pic2.mxf");
 
-	auto sub1 = make_shared<dcp::SMPTESubtitleAsset>();
+	auto sub1 = make_shared<dcp::SMPTETextAsset>();
 
-	sub1->add(std::make_shared<dcp::SubtitleString>(
+	sub1->add(std::make_shared<dcp::TextString>(
 		boost::optional<string>(), false, false, false, dcp::Colour(255, 255, 255),
 		42, 1, dcp::Time(0, 0, 5, 0, 24), dcp::Time(0, 0, 9, 0, 24),
 		0, dcp::HAlign::CENTER,
@@ -470,7 +470,7 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels)
 	sub1->write(path / "ov" / "sub.mxf");
 
 	auto reel1_pic = make_shared<dcp::ReelMonoPictureAsset>(pic1, 0);
-	auto reel1_sub = make_shared<dcp::ReelSMPTESubtitleAsset>(sub1, dcp::Fraction(24, 1), 240, 0);
+	auto reel1_sub = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, sub1, dcp::Fraction(24, 1), 240, 0);
 
 	auto reel2_pic = make_shared<dcp::ReelMonoPictureAsset>(pic1, 0);