Account for split branch in libdcp.split

9 files changed, 55 insertions, 55 deletions

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 9b7b77279..fc7aee984 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -39,7 +39,7 @@
 #include "test.h"
 #include <dcp/mono_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>
 
@@ -292,12 +292,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 e3034def0..dec686a21 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 <boost/test/unit_test.hpp>
 
 
@@ -43,7 +43,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,
@@ -69,7 +69,7 @@ add(std::vector<StringText>& s, std::string text, bool italic, bool bold, bool u
 				),
 			2,
 			std::shared_ptr<dcpomatic::Font>(),
-			dcp::SubtitleStandard::SMPTE_2014
+			dcp::TextStandard::SMPTE_2014
 			)
 		);
 }
@@ -125,7 +125,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),
@@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE(render_text_with_newline_test)
 
 	std::vector<StringText> st;
 	for (auto i: ss) {
-		st.push_back({i, 0, make_shared<dcpomatic::Font>("foo"), dcp::SubtitleStandard::SMPTE_2014});
+		st.push_back({i, 0, make_shared<dcpomatic::Font>("foo"), dcp::TextStandard::SMPTE_2014});
 	}
 
 	auto images = render_text(st, dcp::Size(1998, 1080), {}, 24);
@@ -177,7 +177,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 0ee9cb197..702d0bbb6 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>
@@ -237,12 +237,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 2d8102a07..2466de791 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>
 
@@ -62,8 +62,8 @@ 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;
diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index f6bd48c51..e42033825 100644
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -29,7 +29,7 @@
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
 #include <dcp/reel_subtitle_asset.h>
-#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/smpte_text_asset.h>
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
@@ -127,7 +127,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);
@@ -186,7 +186,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);
@@ -254,8 +254,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_film2(name_base + "_check", { make_shared<DCPContent>(bad_film->dir(bad_film->dcp_name())) });
 	make_and_verify_dcp(check_film);
diff --git a/test/subtitle_position_test.cc b/test/subtitle_position_test.cc
index 94a06b7f8..785164965 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>
 
@@ -55,8 +55,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);
@@ -83,8 +83,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);
@@ -95,18 +95,18 @@ BOOST_AUTO_TEST_CASE(srt_correctly_placed_in_smpte)
 /** Make a DCP from some DCP subtitles and check the vertical alignment */
 static
 void
-vpos_test(dcp::VAlign reference, float position, dcp::SubtitleStandard from, dcp::Standard to)
+vpos_test(dcp::VAlign reference, float position, dcp::TextStandard from, dcp::Standard to)
 {
 	string standard;
 	switch (from) {
-		case dcp::SubtitleStandard::SMPTE_2007:
-		case dcp::SubtitleStandard::SMPTE_2010:
+		case dcp::TextStandard::SMPTE_2007:
+		case dcp::TextStandard::SMPTE_2010:
 			standard = "smpte_2010";
 			break;
-		case dcp::SubtitleStandard::INTEROP:
+		case dcp::TextStandard::INTEROP:
 			standard = "interop";
 			break;
-		case dcp::SubtitleStandard::SMPTE_2014:
+		case dcp::TextStandard::SMPTE_2014:
 			standard = "smpte_2014";
 			break;
 	}
@@ -122,13 +122,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);
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(subtitles_correctly_placed_with_all_references)
 	constexpr auto height = 0.0462963;
 
 	/* Interop source */
-	auto from = dcp::SubtitleStandard::INTEROP;
+	auto from = dcp::TextStandard::INTEROP;
 
 	// -> Interop
 	vpos_test(dcp::VAlign::TOP, 0.2, from, dcp::Standard::INTEROP);
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE(subtitles_correctly_placed_with_all_references)
 	vpos_test(dcp::VAlign::BOTTOM, 0.08, from, dcp::Standard::SMPTE);
 
 	/* SMPTE 2010 source */
-	from = dcp::SubtitleStandard::SMPTE_2010;
+	from = dcp::TextStandard::SMPTE_2010;
 
 	// -> Interop
 	vpos_test(dcp::VAlign::TOP, 0.1 + height - baseline_to_bottom, from, dcp::Standard::INTEROP);
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE(subtitles_correctly_placed_with_all_references)
 	vpos_test(dcp::VAlign::BOTTOM, 0.10 + baseline_to_bottom, from, dcp::Standard::SMPTE);
 
 	/* SMPTE 2014 source */
-	from = dcp::SubtitleStandard::SMPTE_2014;
+	from = dcp::TextStandard::SMPTE_2014;
 
 	// -> Interop
 	vpos_test(dcp::VAlign::TOP, 0.2, from, dcp::Standard::INTEROP);
diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index 743d809dd..e7ac0c907 100644
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -28,7 +28,7 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
-#include <dcp/interop_subtitle_asset.h>
+#include <dcp/interop_text_asset.h>
 #include <dcp/reel_subtitle_asset.h>
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
@@ -65,7 +65,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 d7eb90d25..0f9abe782 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -28,7 +28,7 @@
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
-#include <dcp/interop_subtitle_asset.h>
+#include <dcp/interop_text_asset.h>
 #include <dcp/reel_closed_caption_asset.h>
 #include <dcp/reel_subtitle_asset.h>
 #include <boost/test/unit_test.hpp>
@@ -78,25 +78,25 @@ 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());
 }
 
 
 
 /** Check that with a SMPTE DCP if we have subtitles in one reel, all reels have a
- *  SubtitleAsset (even if it's empty); SMPTE Bv2.1 section 8.3.1.
+ *  TextAsset (even if it's empty); SMPTE Bv2.1 section 8.3.1.
  */
 BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
 {
@@ -224,7 +224,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 e5a4133ad..48c3d00e5 100644
--- a/test/subtitle_timing_test.cc
+++ b/test/subtitle_timing_test.cc
@@ -61,7 +61,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));