summaryrefslogtreecommitdiff
path: root/test/test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-11 22:24:44 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-12 01:22:10 +0200
commit498806d76160a6b1fa0af58e7734c0f553abf12b (patch)
treec5898dca2e84901ea003decb1f3671226d8e53c9 /test/test.cc
parent7d66bda50ade8ea618f331b885f1bfa4fa0a2af9 (diff)
Specify CPL standard on construction.
Then choose which standard DCP should use based on the CPL(s).
Diffstat (limited to 'test/test.cc')
-rw-r--r--test/test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test.cc b/test/test.cc
index c48ecffe..c46e63c9 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -321,7 +321,7 @@ simple_sound (boost::filesystem::path path, string suffix, dcp::MXFMetadata mxf_
shared_ptr<dcp::DCP>
-make_simple (boost::filesystem::path path, int reels, int frames)
+make_simple (boost::filesystem::path path, int reels, int frames, dcp::Standard standard)
{
/* Some known metadata */
dcp::MXFMetadata mxf_meta;
@@ -332,7 +332,7 @@ make_simple (boost::filesystem::path path, int reels, int frames)
boost::filesystem::remove_all (path);
boost::filesystem::create_directories (path);
auto d = make_shared<dcp::DCP>(path);
- auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+ auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, standard);
cpl->set_annotation_text ("A Test DCP");
cpl->set_issuer ("OpenDCP 0.0.25");
cpl->set_creator ("OpenDCP 0.0.25");
@@ -414,7 +414,7 @@ simple_markers (int frames)
shared_ptr<dcp::DCP>
make_simple_with_interop_subs (boost::filesystem::path path)
{
- shared_ptr<dcp::DCP> dcp = make_simple (path);
+ auto dcp = make_simple (path, 1, 24, dcp::Standard::INTEROP);
shared_ptr<dcp::InteropSubtitleAsset> subs(new dcp::InteropSubtitleAsset());
subs->add (simple_subtitle());
@@ -453,7 +453,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path)
shared_ptr<dcp::DCP>
make_simple_with_interop_ccaps (boost::filesystem::path path)
{
- shared_ptr<dcp::DCP> dcp = make_simple (path);
+ auto dcp = make_simple (path, 1, 24, dcp::Standard::INTEROP);
shared_ptr<dcp::InteropSubtitleAsset> subs(new dcp::InteropSubtitleAsset());
subs->add (simple_subtitle());