Add Z position to subtitles; existing tests pass.

6 files changed, 52 insertions, 4 deletions

diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index ce5aeece..0f32a6f4 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -194,6 +194,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 		dcp::Time(0, 0, 5, 0, 24),
 		0.5, dcp::HAlign::CENTER,
 		0.5, dcp::VAlign::CENTER,
+		0,
 		dcp::Direction::LTR,
 		"Hello world",
 		dcp::Effect::NONE,
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index 3c500069..76aafe32 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -83,6 +83,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::HAlign::CENTER,
 				   0.15,
 				   dcp::VAlign::BOTTOM,
+				   0,
 				   dcp::Direction::LTR,
 				   "My jacket was ",
 				   dcp::Effect::BORDER,
@@ -106,6 +107,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::HAlign::CENTER,
 				   0.15,
 				   dcp::VAlign::BOTTOM,
+				   0,
 				   dcp::Direction::LTR,
 				   "Idi Amin's",
 				   dcp::Effect::BORDER,
@@ -132,6 +134,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::HAlign::CENTER,
 				   0.21,
 				   dcp::VAlign::BOTTOM,
+				   0,
 				   dcp::Direction::LTR,
 				   "My corset was H.M. The Queen's",
 				   dcp::Effect::BORDER,
@@ -155,6 +158,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::HAlign::CENTER,
 				   0.15,
 				   dcp::VAlign::BOTTOM,
+				   0,
 				   dcp::Direction::LTR,
 				   "My large wonderbra",
 				   dcp::Effect::BORDER,
@@ -181,6 +185,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::HAlign::CENTER,
 				   0.15,
 				   dcp::VAlign::BOTTOM,
+				   0,
 				   dcp::Direction::LTR,
 				   "Once belonged to the Shah",
 				   dcp::Effect::BORDER,
@@ -207,6 +212,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::HAlign::CENTER,
 				   0.15,
 				   dcp::VAlign::BOTTOM,
+				   0,
 				   dcp::Direction::LTR,
 				   "And these are Roy Hattersley's jeans",
 				   dcp::Effect::BORDER,
@@ -239,6 +245,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "At afternoon tea with John Peel",
 				   dcp::Effect::BORDER,
@@ -262,6 +269,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "I enquired if his accent was real",
 				   dcp::Effect::BORDER,
@@ -288,6 +296,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "He said \"out of the house",
 				   dcp::Effect::BORDER,
@@ -311,6 +320,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "I'm incredibly scouse",
 				   dcp::Effect::BORDER,
@@ -337,6 +347,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "At home it depends how I feel.\"",
 				   dcp::Effect::BORDER,
@@ -360,6 +371,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "I spent a long weekend in Brighton",
 				   dcp::Effect::BORDER,
@@ -386,6 +398,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::RTL,
 				   "With the legendary Miss Enid Blyton",
 				   dcp::Effect::BORDER,
@@ -409,6 +422,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::TTB,
 				   "She said \"you be Noddy",
 				   dcp::Effect::BORDER,
@@ -435,6 +449,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::BTT,
 				   "That curious creature the Sphinx",
 				   dcp::Effect::BORDER,
@@ -458,6 +473,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "Is smarter than anyone thinks",
 				   dcp::Effect::BORDER,
@@ -484,6 +500,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "It sits there and smirks",
 				   dcp::Effect::BORDER,
@@ -507,6 +524,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "And you don't think it works",
 				   dcp::Effect::BORDER,
@@ -533,6 +551,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "Then when you're not looking, it winks.",
 				   dcp::Effect::BORDER,
@@ -556,6 +575,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "When it snows you will find Sister Sledge",
 				   dcp::Effect::BORDER,
@@ -582,6 +602,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "Out mooning, at night, on the ledge",
 				   dcp::Effect::BORDER,
@@ -605,6 +626,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "One storey down",
 				   dcp::Effect::BORDER,
@@ -631,6 +653,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.89,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "HELLO",
 				   dcp::Effect::BORDER,
@@ -654,6 +677,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::HAlign::CENTER,
 				   0.95,
 				   dcp::VAlign::TOP,
+				   0,
 				   dcp::Direction::LTR,
 				   "WORLD",
 				   dcp::Effect::BORDER,
@@ -699,6 +723,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"Hello world",
 			dcp::Effect::NONE,
@@ -724,6 +749,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			dcp::HAlign::CENTER,
 			0.4,
 			dcp::VAlign::BOTTOM,
+			0,
 			dcp::Direction::LTR,
 			"What's going ",
 			dcp::Effect::BORDER,
@@ -749,6 +775,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			dcp::HAlign::CENTER,
 			0.4,
 			dcp::VAlign::BOTTOM,
+			0,
 			dcp::Direction::LTR,
 			"on",
 			dcp::Effect::BORDER,
@@ -808,6 +835,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"Hello world",
 			dcp::Effect::NONE,
@@ -833,6 +861,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 			dcp::HAlign::CENTER,
 			0.4,
 			dcp::VAlign::BOTTOM,
+			0,
 			dcp::Direction::LTR,
 			"What's going on",
 			dcp::Effect::BORDER,
@@ -886,6 +915,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24)
 			)
diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index 5d9ba9a4..9c841f90 100644
--- a/test/shared_subtitle_test.cc
+++ b/test/shared_subtitle_test.cc
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test1)
 	auto root = make_shared<dcp::order::Part>(shared_ptr<dcp::order::Part>());
 	auto sub1 = make_shared<dcp::order::Subtitle>(root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time());
 	root->children.push_back (sub1);
-	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, dcp::Direction::LTR);
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, dcp::Direction::LTR);
 	sub1->children.push_back (text1);
 	text1->font._values["font"] = "Inconsolata";
 	text1->font._values["size"] = "42";
@@ -127,11 +127,11 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test2)
 	auto root = make_shared<dcp::order::Part>(shared_ptr<dcp::order::Part> ());
 	auto sub1 = make_shared<dcp::order::Subtitle>(root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time());
 	root->children.push_back (sub1);
-	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, dcp::Direction::LTR);
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, dcp::Direction::LTR);
 	sub1->children.push_back (text1);
 	text1->font._values["font"] = "Inconsolata";
 	text1->font._values["size"] = "42";
-	auto text2 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, dcp::Direction::LTR);
+	auto text2 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, dcp::Direction::LTR);
 	sub1->children.push_back (text2);
 	text2->font._values["font"] = "Inconsolata";
 	text2->font._values["size"] = "48";
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test3)
 	auto root = make_shared<dcp::order::Part>(shared_ptr<dcp::order::Part> ());
 	auto sub1 = make_shared<dcp::order::Subtitle>(root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time());
 	root->children.push_back (sub1);
-	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, dcp::Direction::LTR);
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, dcp::Direction::LTR);
 	sub1->children.push_back (text1);
 	dcp::order::Font font;
 	font._values["font"] = "Inconsolata";
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 347681de..cfea04c4 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -66,6 +66,7 @@ BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 			dcp::HAlign::CENTER,
 			0.5,
 			dcp::VAlign::CENTER,
+			0,
 			dcp::Direction::LTR,
 			"Hello",
 			dcp::Effect::NONE,
@@ -194,6 +195,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"Hello world",
 			dcp::Effect::NONE,
@@ -219,6 +221,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			dcp::HAlign::CENTER,
 			0.4,
 			dcp::VAlign::BOTTOM,
+			0,
 			dcp::Direction::RTL,
 			"What's going ",
 			dcp::Effect::BORDER,
@@ -244,6 +247,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			dcp::HAlign::CENTER,
 			0.4,
 			dcp::VAlign::BOTTOM,
+			0,
 			dcp::Direction::RTL,
 			"on",
 			dcp::Effect::BORDER,
@@ -310,6 +314,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"Testing is ",
 			dcp::Effect::NONE,
@@ -335,6 +340,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"really",
 			dcp::Effect::NONE,
@@ -360,6 +366,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			" fun",
 			dcp::Effect::NONE,
@@ -385,6 +392,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::HAlign::CENTER,
 			0.9,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"This is the ",
 			dcp::Effect::NONE,
@@ -410,6 +418,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::HAlign::CENTER,
 			0.9,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"second",
 			dcp::Effect::NONE,
@@ -435,6 +444,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::HAlign::CENTER,
 			0.9,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			" line",
 			dcp::Effect::NONE,
@@ -491,6 +501,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24)
 			)
@@ -546,6 +557,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"Top line",
 			dcp::Effect::NONE,
@@ -571,6 +583,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 			dcp::HAlign::CENTER,
 			0.9,
 			dcp::VAlign::TOP,
+			0,
 			dcp::Direction::LTR,
 			"Bottom line",
 			dcp::Effect::NONE,
@@ -632,6 +645,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 			dcp::HAlign::CENTER,
 			0.8,
 			dcp::VAlign::BOTTOM,
+			0,
 			dcp::Direction::LTR,
 			"Top line",
 			dcp::Effect::NONE,
@@ -657,6 +671,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 			dcp::HAlign::CENTER,
 			0.7,
 			dcp::VAlign::BOTTOM,
+			0,
 			dcp::Direction::LTR,
 			"Bottom line",
 			dcp::Effect::NONE,
diff --git a/test/test.cc b/test/test.cc
index bfee68f7..a2016e92 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -400,6 +400,7 @@ simple_subtitle ()
 		dcp::HAlign::CENTER,
 		0.8,
 		dcp::VAlign::TOP,
+		0,
 		dcp::Direction::LTR,
 		"Hello world",
 		dcp::Effect::NONE,
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 0b65c9d3..6dfcc58a 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -1256,6 +1256,7 @@ add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int en
 			dcp::HAlign::CENTER,
 			v_position,
 			v_align,
+			0,
 			dcp::Direction::LTR,
 			text,
 			dcp::Effect::NONE,