diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-07-09 20:41:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-07-11 12:22:11 +0200 |
| commit | b1e22dff981fb86ae04b12bb5a064e61030793a8 (patch) | |
| tree | ffb112f6e3f3311d8669f6a89628bf5f0bc40f2e /test/atmos_test.cc | |
| parent | 736d6bf3242a0ba3841cb765e97cf9fee3540460 (diff) | |
Use a vector rather than a list when returning from content_factory().
Diffstat (limited to 'test/atmos_test.cc')
| -rw-r--r-- | test/atmos_test.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/atmos_test.cc b/test/atmos_test.cc index a364aa0eb..661eca5b9 100644 --- a/test/atmos_test.cc +++ b/test/atmos_test.cc @@ -26,7 +26,6 @@ #include "lib/film.h" #include "test.h" #include <boost/test/unit_test.hpp> -#include <iostream> using std::string; @@ -42,7 +41,7 @@ BOOST_AUTO_TEST_CASE (atmos_passthrough_test) auto film = new_test_film2 ( "atmos_passthrough_test", - { content_factory(TestPaths::private_data() / "atmos_asset.mxf").front() }, + content_factory(TestPaths::private_data() / "atmos_asset.mxf"), &cl ); @@ -60,8 +59,8 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test) Cleanup cl; auto ref = TestPaths::private_data() / "atmos_asset.mxf"; - auto content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front(); - auto film = new_test_film2 ("atmos_encrypted_passthrough_test", {content}, &cl); + auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf"); + auto film = new_test_film2 ("atmos_encrypted_passthrough_test", content, &cl); film->set_encrypted (true); film->_key = dcp::Key ("4fac12927eb122af1c2781aa91f3a4cc"); @@ -96,10 +95,10 @@ BOOST_AUTO_TEST_CASE (atmos_trim_test) Cleanup cl; auto ref = TestPaths::private_data() / "atmos_asset.mxf"; - auto content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front(); - auto film = new_test_film2 ("atmos_trim_test", {content}, &cl); + auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf"); + auto film = new_test_film2 ("atmos_trim_test", content, &cl); - content->set_trim_start (dcpomatic::ContentTime::from_seconds(1)); + content[0]->set_trim_start (dcpomatic::ContentTime::from_seconds(1)); /* Just check that the encode runs; I'm not sure how to test the MXF */ make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA }); |