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/optimise_stills_test.cc | |
| parent | 736d6bf3242a0ba3841cb765e97cf9fee3540460 (diff) | |
Use a vector rather than a list when returning from content_factory().
Diffstat (limited to 'test/optimise_stills_test.cc')
| -rw-r--r-- | test/optimise_stills_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/optimise_stills_test.cc b/test/optimise_stills_test.cc index f2690f61e..6374d5474 100644 --- a/test/optimise_stills_test.cc +++ b/test/optimise_stills_test.cc @@ -19,30 +19,30 @@ */ +#include "lib/content.h" +#include "lib/content_factory.h" +#include "lib/dcp_content_type.h" #include "lib/dcp_encoder.h" -#include "lib/writer.h" -#include "lib/transcode_job.h" -#include "lib/job_manager.h" +#include "lib/dcpomatic_log.h" #include "lib/film.h" +#include "lib/job_manager.h" #include "lib/ratio.h" -#include "lib/content_factory.h" -#include "lib/dcp_content_type.h" -#include "lib/content.h" +#include "lib/transcode_job.h" #include "lib/video_content.h" -#include "lib/dcpomatic_log.h" +#include "lib/writer.h" #include "test.h" -#include <boost/test/unit_test.hpp> #include <boost/algorithm/string.hpp> +#include <boost/test/unit_test.hpp> +using std::dynamic_pointer_cast; using std::getline; using std::ifstream; +using std::shared_ptr; using std::string; using std::vector; using boost::starts_with; using boost::split; -using std::dynamic_pointer_cast; -using std::shared_ptr; static @@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE (optimise_stills_test1) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - auto content = content_factory("test/data/flat_red.png").front (); + auto content = content_factory("test/data/flat_red.png")[0]; film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); make_and_verify_dcp (film); @@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (optimise_stills_test2) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name("TLR")); film->set_name ("frobozz"); - auto content = content_factory("test/data/flat_red.png").front(); + auto content = content_factory("test/data/flat_red.png")[0]; film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); content->video->set_frame_type (VideoFrameType::THREE_D_LEFT_RIGHT); |