diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-07-15 03:36:59 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-07-15 18:03:57 +0200 |
| commit | 21415bdb69a99c4fc36cf4b5e5160a171bb1cad4 (patch) | |
| tree | 46265de6587585d292ac4c97267327af0c359c1c /test/subtitle_reel_test.cc | |
| parent | 6207d271effad4e691a5155ccdad083e03b010bc (diff) | |
Change Film::examine_and_add_content to take a vector of content.
Diffstat (limited to 'test/subtitle_reel_test.cc')
| -rw-r--r-- | test/subtitle_reel_test.cc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc index a9fa2915d..875fb51fe 100644 --- a/test/subtitle_reel_test.cc +++ b/test/subtitle_reel_test.cc @@ -49,10 +49,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test) auto sub_a = make_shared<DCPSubtitleContent>("test/data/png_subs/subs.xml"); auto sub_b = make_shared<DCPSubtitleContent>("test/data/png_subs/subs.xml"); - film->examine_and_add_content (red_a); - film->examine_and_add_content (red_b); - film->examine_and_add_content (sub_a); - film->examine_and_add_content (sub_b); + film->examine_and_add_content({red_a, red_b, sub_a, sub_b}); BOOST_REQUIRE (!wait_for_jobs()); @@ -107,13 +104,13 @@ BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test) film->set_reel_type (ReelType::BY_VIDEO_CONTENT); for (int i = 0; i < 3; ++i) { auto video = content_factory("test/data/flat_red.png")[0]; - film->examine_and_add_content (video); + film->examine_and_add_content({video}); BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (15 * 24); video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i)); } auto subs = content_factory("test/data/15s.srt")[0]; - film->examine_and_add_content (subs); + film->examine_and_add_content({subs}); BOOST_REQUIRE (!wait_for_jobs()); make_and_verify_dcp ( film, @@ -147,20 +144,20 @@ BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test) for (int i = 0; i < 3; ++i) { auto video = content_factory("test/data/flat_red.png")[0]; - film->examine_and_add_content (video); + film->examine_and_add_content({video}); BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (15 * 24); video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i)); } auto ccap1 = content_factory("test/data/15s.srt")[0]; - film->examine_and_add_content (ccap1); + film->examine_and_add_content({ccap1}); BOOST_REQUIRE (!wait_for_jobs()); ccap1->text.front()->set_type (TextType::CLOSED_CAPTION); ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", dcp::LanguageTag("de-DE"))); auto ccap2 = content_factory("test/data/15s.srt")[0]; - film->examine_and_add_content (ccap2); + film->examine_and_add_content({ccap2}); BOOST_REQUIRE (!wait_for_jobs()); ccap2->text.front()->set_type (TextType::CLOSED_CAPTION); ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", dcp::LanguageTag("en-GB"))); @@ -206,14 +203,14 @@ BOOST_AUTO_TEST_CASE (subtitles_split_at_reel_boundaries) for (int i = 0; i < 3; ++i) { auto video = content_factory("test/data/flat_red.png")[0]; - film->examine_and_add_content (video); + film->examine_and_add_content({video}); BOOST_REQUIRE (!wait_for_jobs()); video->video->set_length (15 * 24); video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i)); } auto subtitle = content_factory("test/data/45s.srt")[0]; - film->examine_and_add_content (subtitle); + film->examine_and_add_content({subtitle}); BOOST_REQUIRE (!wait_for_jobs()); subtitle->only_text()->set_language(dcp::LanguageTag("de")); |