wip: ruby2652-ruby

1 files changed, 44 insertions, 50 deletions

diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index d5094f87..dacf905a 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -68,13 +68,12 @@ BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Hello",
+			string{"Hello"},
 			dcp::Effect::NONE,
 			dcp::Colour(),
 			dcp::Time(0, 0, 0, 0, 24),
 			dcp::Time(0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 	subs.write("build/test/smpte_subtitle_id_test.mxf");
@@ -114,12 +113,14 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
 	BOOST_CHECK_EQUAL (smpte_lfn->urn, "9118bbce-4105-4a05-b37c-a5a6f75e1fea");
 	BOOST_REQUIRE_EQUAL(sc.texts().size(), 63U);
 	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(sc.texts().front()));
-	BOOST_CHECK_EQUAL(dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->text(), "Noch mal.");
+	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->string_text());
+	BOOST_CHECK_EQUAL(*dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->string_text(), "Noch mal.");
 	BOOST_CHECK_EQUAL(dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->space_before(), 0.0f);
 	BOOST_CHECK_EQUAL(sc.texts().front()->in(), dcp::Time (0, 0, 25, 12, 25));
 	BOOST_CHECK_EQUAL(sc.texts().front()->out(), dcp::Time (0, 0, 26, 4, 25));
 	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(sc.texts().back()));
-	BOOST_CHECK_EQUAL(dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->text(), "Prochainement");
+	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->string_text());
+	BOOST_CHECK_EQUAL(*dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->string_text(), "Prochainement");
 	BOOST_CHECK_EQUAL(dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->space_before(), 0.0f);
 	BOOST_CHECK_EQUAL(sc.texts().back()->in(), dcp::Time (0, 1, 57, 17, 25));
 	BOOST_CHECK_EQUAL(sc.texts().back()->out(), dcp::Time (0, 1, 58, 12, 25));
@@ -136,37 +137,43 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
 	auto i = 0;
 	auto is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), "Testing is ");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), "Testing is ");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), "really");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), "really");
 	BOOST_CHECK (is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), " fun!");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), " fun!");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 5, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), "This is the ");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), "This is the ");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), "second");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), "second");
 	BOOST_CHECK (is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), " line!");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), " line!");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 }
@@ -199,13 +206,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			0.3,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Hello world",
+			string{"Hello world"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -227,13 +233,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::RTL,
-			"What's going ",
+			string{"What's going "},
 			dcp::Effect::BORDER,
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -255,13 +260,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::RTL,
-			"on",
+			string{"on"},
 			dcp::Effect::BORDER,
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			4.2,
-			std::vector<dcp::Ruby>()
+			4.2
 			)
 		);
 
@@ -324,13 +328,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Testing is ",
+			string{"Testing is "},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -352,13 +355,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"really",
+			string{"really"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -380,13 +382,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			" fun",
+			string{" fun"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -408,13 +409,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"This is the ",
+			string{"This is the "},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -436,13 +436,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"second",
+			string{"second"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -464,13 +463,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			" line",
+			string{" line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -581,13 +579,12 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Top line",
+			string{"Top line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -609,13 +606,12 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Bottom line",
+			string{"Bottom line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -673,13 +669,12 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Top line",
+			string{"Top line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -701,13 +696,12 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Bottom line",
+			string{"Bottom line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);