diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-11 20:49:18 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-11 20:50:12 +0200 |
| commit | 3370a67e8a9aeaec45911ba1c714a0d259781fdf (patch) | |
| tree | e1d49c3d59eeb94dfa836b90f8c9042df3528c82 /test/dcp_font_test.cc | |
| parent | 3a94f95d49e99fe5936e19977c28de25033488a8 (diff) | |
Small bits of tidying up.
Diffstat (limited to 'test/dcp_font_test.cc')
| -rw-r--r-- | test/dcp_font_test.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc index da9d3000..2ac68273 100644 --- a/test/dcp_font_test.cc +++ b/test/dcp_font_test.cc @@ -31,6 +31,7 @@ files in the program, then also delete it here. */ + #include "interop_subtitle_asset.h" #include "smpte_subtitle_asset.h" #include "dcp.h" @@ -38,10 +39,12 @@ #include "test.h" #include "reel.h" #include "util.h" -#include "reel_subtitle_asset.h" +#include "reel_interop_subtitle_asset.h" +#include "reel_smpte_subtitle_asset.h" #include <boost/test/unit_test.hpp> #include <cstdio> + using std::list; using std::string; using std::shared_ptr; @@ -55,13 +58,13 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test) boost::filesystem::path directory = "build/test/interop_dcp_font_test"; dcp::DCP dcp (directory); - shared_ptr<dcp::InteropSubtitleAsset> subs (new dcp::InteropSubtitleAsset ()); + auto subs = make_shared<dcp::InteropSubtitleAsset>(); subs->add_font ("theFontId", dcp::ArrayData("test/data/dummy.ttf")); subs->write (directory / "frobozz.xml"); check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/font_0.ttf"); auto reel = make_shared<dcp::Reel>(); - reel->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction (24, 1), 24, 0)); + reel->add (make_shared<dcp::ReelInteropSubtitleAsset>(subs, dcp::Fraction (24, 1), 24, 0)); auto cpl = make_shared<dcp::CPL>("", dcp::ContentKind::TRAILER); cpl->add (reel); @@ -98,7 +101,7 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test) subs->write (directory / "frobozz.mxf"); auto reel = make_shared<dcp::Reel>(); - reel->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction (24, 1), 24, 0)); + reel->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction (24, 1), 24, 0)); auto cpl = make_shared<dcp::CPL>("", dcp::ContentKind::TRAILER); cpl->add (reel); |