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/isdcf_name_test.cc | |
| parent | 736d6bf3242a0ba3841cb765e97cf9fee3540460 (diff) | |
Use a vector rather than a list when returning from content_factory().
Diffstat (limited to 'test/isdcf_name_test.cc')
| -rw-r--r-- | test/isdcf_name_test.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index d3227f636..4d17f704c 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -25,22 +25,20 @@ */ -#include <boost/test/unit_test.hpp> -#include "lib/film.h" -#include "lib/ratio.h" -#include "lib/dcp_content_type.h" -#include "lib/image_content.h" -#include "lib/video_content.h" -#include "lib/audio_mapping.h" -#include "lib/ffmpeg_content.h" #include "lib/audio_content.h" +#include "lib/audio_mapping.h" #include "lib/content_factory.h" +#include "lib/dcp_content_type.h" +#include "lib/ffmpeg_content.h" +#include "lib/film.h" +#include "lib/image_content.h" +#include "lib/ratio.h" #include "lib/text_content.h" +#include "lib/video_content.h" #include "test.h" -#include <iostream> +#include <boost/test/unit_test.hpp> -using std::cout; using std::make_shared; using std::shared_ptr; using std::string; @@ -56,7 +54,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4); - auto audio = content_factory("test/data/sine_440.wav").front(); + auto audio = content_factory("test/data/sine_440.wav")[0]; film->examine_and_add_content (audio); BOOST_REQUIRE (!wait_for_jobs()); film->set_audio_language(dcp::LanguageTag("en-US")); @@ -80,7 +78,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4); film->set_audio_channels (1); film->set_resolution (Resolution::FOUR_K); - auto text = content_factory("test/data/subrip.srt").front(); + auto text = content_factory("test/data/subrip.srt")[0]; BOOST_REQUIRE_EQUAL (text->text.size(), 1U); text->text.front()->set_burn (true); text->text.front()->set_language (dcp::LanguageTag("fr-FR")); @@ -91,7 +89,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_studio (string("di")); film->set_facility (string("ppfacility")); BOOST_REQUIRE (!wait_for_jobs()); - audio = content_factory("test/data/sine_440.wav").front(); + audio = content_factory("test/data/sine_440.wav")[0]; film->examine_and_add_content (audio); BOOST_REQUIRE (!wait_for_jobs()); film->set_audio_language (dcp::LanguageTag("de-DE")); |