Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / test / smpte_subtitle_test.cc

diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 6f72511e299c5cbcc379242d308adc30a3b158b4..2af7669605ee5a7fb2dd753476bb099c48e30486 100644 (file)
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -34,34 +34,33 @@
 #include <boost/test/unit_test.hpp>
 #include "smpte_subtitle_asset.h"
 
+using std::make_shared;
 using std::string;
-using boost::optional;
 using std::shared_ptr;
+using boost::optional;
 
 BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 {
        dcp::SMPTESubtitleAsset subs;
        subs.add(
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString(
-                               optional<string>(),
-                               false, false, false,
-                               dcp::Colour(),
-                               64,
-                               1,
-                               dcp::Time(0, 1, 2, 3, 24),
-                               dcp::Time(0, 2, 2, 3, 24),
-                               0.5,
-                               dcp::HALIGN_CENTER,
-                               0.5,
-                               dcp::VALIGN_CENTER,
-                               dcp::DIRECTION_LTR,
-                               "Hello",
-                               dcp::NONE,
-                               dcp::Colour(),
-                               dcp::Time(0, 0, 0, 0, 24),
-                               dcp::Time(0, 0, 0, 0, 24)
-                               )
+               make_shared<dcp::SubtitleString>(
+                       optional<string>(),
+                       false, false, false,
+                       dcp::Colour(),
+                       64,
+                       1,
+                       dcp::Time(0, 1, 2, 3, 24),
+                       dcp::Time(0, 2, 2, 3, 24),
+                       0.5,
+                       dcp::HAlign::CENTER,
+                       0.5,
+                       dcp::VAlign::CENTER,
+                       dcp::Direction::LTR,
+                       "Hello",
+                       dcp::Effect::NONE,
+                       dcp::Colour(),
+                       dcp::Time(0, 0, 0, 0, 24),
+                       dcp::Time(0, 0, 0, 0, 24)
                        )
                );
        subs.write("build/test/smpte_subtitle_id_test.mxf");