Fix rebase onto 1.0.

[libdcp.git] / test / write_subtitle_test.cc

diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index b5daa2b1774f1befd8d02f9d3fdff7c0cf7a460f..b02a6e59648e61d9bfb41cab05edb6adbe4ebbbc 100644 (file)
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "interop_subtitle_content.h"
+#include "interop_subtitle_asset.h"
 #include "subtitle_string.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 /* Write some subtitle content as Interop XML and check that it is right */
 BOOST_AUTO_TEST_CASE (write_subtitle_test)
 {
-       dcp::InteropSubtitleContent c ("Test", "EN");
+       dcp::InteropSubtitleAsset c ("Test", "EN");
 
        c.add (
                dcp::SubtitleString (
@@ -37,10 +37,13 @@ BOOST_AUTO_TEST_CASE (write_subtitle_test)
                        false,
                        dcp::Colour (255, 255, 255),
                        48,
+                       1.0,
                        dcp::Time (0, 4,  9, 22, 24),
                        dcp::Time (0, 4, 11, 22, 24),
+                       0,
+                       dcp::HALIGN_CENTER,
                        0.8,
-                       dcp::TOP,
+                       dcp::VALIGN_TOP,
                        "Hello world",
                        dcp::NONE,
                        dcp::Colour (0, 0, 0),
@@ -55,10 +58,13 @@ BOOST_AUTO_TEST_CASE (write_subtitle_test)
                        true,
                        dcp::Colour (128, 0, 64),
                        91,
+                       1.0,
                        dcp::Time (5, 41,  0, 21, 24),
                        dcp::Time (6, 12, 15, 21, 24),
+                       0,
+                       dcp::HALIGN_CENTER,
                        0.4,
-                       dcp::BOTTOM,
+                       dcp::VALIGN_BOTTOM,
                        "What's going on",
                        dcp::BORDER,
                        dcp::Colour (1, 2, 3),