Add DCNC tags file.

[libdcp.git] / test / read_interop_subtitle_test.cc

diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index d37e60d4dad577ea54c43762cce1d3a085a45dc9..48892db58b0ff6b81eb36694186fa3718d401b8a 100644 (file)
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -74,12 +74,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::Time (0, 0, 5, 198, 250),
                                   dcp::Time (0, 0, 7, 115, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.15,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::BOTTOM,
+                                  dcp::Direction::LTR,
                                   "My jacket was Idi Amin's",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1, 250),
                                   dcp::Time (0, 0, 0, 1, 250)
@@ -99,12 +99,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::Time (0, 0, 7, 177, 250),
                                   dcp::Time (0, 0, 11, 31, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.21,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::BOTTOM,
+                                  dcp::Direction::LTR,
                                   "My corset was H.M. The Queen's",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1, 250),
                                   dcp::Time (0, 0, 0, 1, 250)
@@ -121,12 +121,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::Time (0, 0, 7, 177, 250),
                                   dcp::Time (0, 0, 11, 31, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.15,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::BOTTOM,
+                                  dcp::Direction::LTR,
                                   "My large wonderbra",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1, 250),
                                   dcp::Time (0, 0, 0, 1, 250)
@@ -146,12 +146,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::Time (0, 0, 11, 94, 250),
                                   dcp::Time (0, 0, 13, 63, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.15,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::BOTTOM,
+                                  dcp::Direction::LTR,
                                   "Once belonged to the Shah",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1, 250),
                                   dcp::Time (0, 0, 0, 1, 250)
@@ -171,12 +171,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::Time (0, 0, 13, 104, 250),
                                   dcp::Time (0, 0, 15, 177, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.15,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::BOTTOM,
+                                  dcp::Direction::LTR,
                                   "And these are Roy Hattersley's jeans",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1, 250),
                                   dcp::Time (0, 0, 0, 1, 250)
@@ -202,12 +202,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 0, 41, 62, 250),
                                   dcp::Time (0, 0, 43, 52, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "At afternoon tea with John Peel",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
@@ -224,12 +224,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 0, 41, 62, 250),
                                   dcp::Time (0, 0, 43, 52, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "I enquired if his accent was real",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
@@ -249,12 +249,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 0, 50, 42, 250),
                                   dcp::Time (0, 0, 52, 21, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "He said \"out of the house",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
@@ -271,12 +271,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 0, 50, 42, 250),
                                   dcp::Time (0, 0, 52, 21, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "I'm incredibly scouse",
-                                  dcp::BORDER,
+                                  dcp::Effect::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
@@ -286,25 +286,25 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
        BOOST_REQUIRE_EQUAL (s.size(), 2);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
+                                  string("theFont"),
                                   true,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 2, 208, 250),
-                                  dcp::Time (0, 1, 4, 10, 250),
+                                  dcp::Time(0, 1, 2, 208, 250),
+                                  dcp::Time(0, 1, 4, 10, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "At home it depends how I feel.\"",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -312,21 +312,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   true,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 2, 208, 250),
-                                  dcp::Time (0, 1, 4, 10, 250),
+                                  dcp::Time(0, 1, 2, 208, 250),
+                                  dcp::Time(0, 1, 4, 10, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "I spent a long weekend in Brighton",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
@@ -337,21 +337,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   true,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 15, 42, 250),
-                                  dcp::Time (0, 1, 16, 42, 250),
+                                  dcp::Time(0, 1, 15, 42, 250),
+                                  dcp::Time(0, 1, 16, 42, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_RTL,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::RTL,
                                   "With the legendary Miss Enid Blyton",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -359,21 +359,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   true,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 15, 42, 250),
-                                  dcp::Time (0, 1, 16, 42, 250),
+                                  dcp::Time(0, 1, 15, 42, 250),
+                                  dcp::Time(0, 1, 16, 42, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_TTB,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::TTB,
                                   "She said \"you be Noddy",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
@@ -384,21 +384,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   true,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 27, 115, 250),
-                                  dcp::Time (0, 1, 28, 208, 250),
+                                  dcp::Time(0, 1, 27, 115, 250),
+                                  dcp::Time(0, 1, 28, 208, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_BTT,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::BTT,
                                   "That curious creature the Sphinx",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -406,21 +406,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   true,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 27, 115, 250),
-                                  dcp::Time (0, 1, 28, 208, 250),
+                                  dcp::Time(0, 1, 27, 115, 250),
+                                  dcp::Time(0, 1, 28, 208, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "Is smarter than anyone thinks",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
@@ -437,15 +437,15 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 1, 42, 229, 250),
                                   dcp::Time (0, 1, 45, 62, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "It sits there and smirks",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -459,40 +459,40 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 1, 42, 229, 250),
                                   dcp::Time (0, 1, 45, 62, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "And you don't think it works",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
        BOOST_REQUIRE_EQUAL (s.size(), 2);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
+                                  string("theFont"),
                                   false,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 45, 146, 250),
-                                  dcp::Time (0, 1, 47, 94, 250),
+                                  dcp::Time(0, 1, 45, 146, 250),
+                                  dcp::Time(0, 1, 47, 94, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "Then when you're not looking, it winks.",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -506,15 +506,15 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 1, 45, 146, 250),
                                   dcp::Time (0, 1, 47, 94, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "When it snows you will find Sister Sledge",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
@@ -525,21 +525,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   false,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 47, 146, 250),
-                                  dcp::Time (0, 1, 48, 167, 250),
+                                  dcp::Time(0, 1, 47, 146, 250),
+                                  dcp::Time(0, 1, 48, 167, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "Out mooning, at night, on the ledge",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -547,21 +547,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   false,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 1, 47, 146, 250),
-                                  dcp::Time (0, 1, 48, 167, 250),
+                                  dcp::Time(0, 1, 47, 146, 250),
+                                  dcp::Time(0, 1, 48, 167, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "One storey down",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
@@ -578,15 +578,15 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 2, 5, 208, 250),
                                   dcp::Time (0, 2, 7, 31, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "HELLO",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -594,21 +594,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   true,
                                   false,
                                   false,
-                                  dcp::Colour (255, 255, 255),
+                                  dcp::Colour(255, 255, 255),
                                   42,
                                   1.0,
-                                  dcp::Time (0, 2, 5, 208, 250),
-                                  dcp::Time (0, 2, 7, 31, 250),
+                                  dcp::Time(0, 2, 5, 208, 250),
+                                  dcp::Time(0, 2, 7, 31, 250),
                                   0,
-                                  dcp::HALIGN_CENTER,
+                                  dcp::HAlign::CENTER,
                                   0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
+                                  dcp::VAlign::TOP,
+                                  dcp::Direction::LTR,
                                   "WORLD",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
+                                  dcp::Effect::BORDER,
+                                  dcp::Colour(0, 0, 0),
+                                  dcp::Time(0, 0, 0, 0, 250),
+                                  dcp::Time(0, 0, 0, 0, 250)
                                   ));
 }