Add Z position to subtitles; existing tests pass.

1 files changed, 30 insertions, 0 deletions

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)
 			)