Support horizontal alignment specification in subtitles.

1 files changed, 50 insertions, 25 deletions

diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc
index d1b2795f..8f0b0855 100644
--- a/test/subtitle_tests.cc
+++ b/test/subtitle_tests.cc
@@ -40,7 +40,8 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   libdcp::Time (0, 0, 5, 198, 250),
 				   libdcp::Time (0, 0, 7, 115, 250),
 				   15,
-				   libdcp::BOTTOM,
+				   libdcp::VERTICAL_BOTTOM,
+				   libdcp::HORIZONTAL_CENTER,
 				   "My jacket was Idi Amin's",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -58,7 +59,8 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   libdcp::Time (0, 0, 7, 177, 250),
 				   libdcp::Time (0, 0, 11, 31, 250),
 				   21,
-				   libdcp::BOTTOM,
+				   libdcp::VERTICAL_BOTTOM,
+				   libdcp::HORIZONTAL_CENTER,
 				   "My corset was H.M. The Queen's",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -73,7 +75,8 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   libdcp::Time (0, 0, 7, 177, 250),
 				   libdcp::Time (0, 0, 11, 31, 250),
 				   15,
-				   libdcp::BOTTOM,
+				   libdcp::VERTICAL_BOTTOM,
+				   libdcp::HORIZONTAL_CENTER,
 				   "My large wonderbra",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -91,7 +94,8 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   libdcp::Time (0, 0, 11, 94, 250),
 				   libdcp::Time (0, 0, 13, 63, 250),
 				   15,
-				   libdcp::BOTTOM,
+				   libdcp::VERTICAL_BOTTOM,
+				   libdcp::HORIZONTAL_CENTER,
 				   "Once belonged to the Shah",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -109,7 +113,8 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   libdcp::Time (0, 0, 13, 104, 250),
 				   libdcp::Time (0, 0, 15, 177, 250),
 				   15,
-				   libdcp::BOTTOM,
+				   libdcp::VERTICAL_BOTTOM,
+				   libdcp::HORIZONTAL_CENTER,
 				   "And these are Roy Hattersley's jeans",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -133,7 +138,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 0, 41, 62, 250),
 				   libdcp::Time (0, 0, 43, 52, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "At afternoon tea with John Peel",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -148,7 +154,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 0, 41, 62, 250),
 				   libdcp::Time (0, 0, 43, 52, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "I enquired if his accent was real",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -166,7 +173,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 0, 50, 42, 250),
 				   libdcp::Time (0, 0, 52, 21, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "He said \"out of the house",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -181,7 +189,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 0, 50, 42, 250),
 				   libdcp::Time (0, 0, 52, 21, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "I'm incredibly scouse",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -199,7 +208,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 2, 208, 250),
 				   libdcp::Time (0, 1, 4, 10, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "At home it depends how I feel.\"",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -214,7 +224,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 2, 208, 250),
 				   libdcp::Time (0, 1, 4, 10, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "I spent a long weekend in Brighton",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -232,7 +243,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 15, 42, 250),
 				   libdcp::Time (0, 1, 16, 42, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "With the legendary Miss Enid Blyton",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -247,7 +259,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 15, 42, 250),
 				   libdcp::Time (0, 1, 16, 42, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "She said \"you be Noddy",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -265,7 +278,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 27, 115, 250),
 				   libdcp::Time (0, 1, 28, 208, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "That curious creature the Sphinx",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -280,7 +294,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 27, 115, 250),
 				   libdcp::Time (0, 1, 28, 208, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "Is smarter than anyone thinks",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -298,7 +313,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 42, 229, 250),
 				   libdcp::Time (0, 1, 45, 62, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "It sits there and smirks",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -313,7 +329,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 42, 229, 250),
 				   libdcp::Time (0, 1, 45, 62, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "And you don't think it works",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -331,7 +348,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 45, 146, 250),
 				   libdcp::Time (0, 1, 47, 94, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "Then when you're not looking, it winks.",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -346,7 +364,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 45, 146, 250),
 				   libdcp::Time (0, 1, 47, 94, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "When it snows you will find Sister Sledge",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -364,7 +383,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 47, 146, 250),
 				   libdcp::Time (0, 1, 48, 167, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "Out mooning, at night, on the ledge",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -379,7 +399,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 1, 47, 146, 250),
 				   libdcp::Time (0, 1, 48, 167, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "One storey down",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -397,7 +418,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 2, 5, 208, 250),
 				   libdcp::Time (0, 2, 7, 31, 250),
 				   89,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "HELLO",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -412,7 +434,8 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   libdcp::Time (0, 2, 5, 208, 250),
 				   libdcp::Time (0, 2, 7, 31, 250),
 				   95,
-				   libdcp::TOP,
+				   libdcp::VERTICAL_TOP,
+				   libdcp::HORIZONTAL_CENTER,
 				   "WORLD",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -437,7 +460,8 @@ BOOST_AUTO_TEST_CASE (subtitles3)
 				   libdcp::Time (0, 0, 4, 21, 25),
 				   libdcp::Time (0, 0, 6, 5, 25),
 				   8,
-				   libdcp::BOTTOM,
+				   libdcp::VERTICAL_BOTTOM,
+				   libdcp::HORIZONTAL_CENTER,
 				   "Hello world",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),
@@ -462,7 +486,8 @@ BOOST_AUTO_TEST_CASE (subtitles4)
 				   libdcp::Time (0, 0, 4, 21, 25),
 				   libdcp::Time (0, 0, 6, 5, 25),
 				   8,
-				   libdcp::BOTTOM,
+				   libdcp::VERTICAL_BOTTOM,
+				   libdcp::HORIZONTAL_CENTER,
 				   "Hello <i>there</i> world",
 				   libdcp::BORDER,
 				   libdcp::Color (0, 0, 0),