summaryrefslogtreecommitdiff
path: root/test/reels_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-07-09 20:41:10 +0200
committerCarl Hetherington <cth@carlh.net>2022-07-11 12:22:11 +0200
commitb1e22dff981fb86ae04b12bb5a064e61030793a8 (patch)
treeffb112f6e3f3311d8669f6a89628bf5f0bc40f2e /test/reels_test.cc
parent736d6bf3242a0ba3841cb765e97cf9fee3540460 (diff)
Use a vector rather than a list when returning from content_factory().
Diffstat (limited to 'test/reels_test.cc')
-rw-r--r--test/reels_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/reels_test.cc b/test/reels_test.cc
index 5bee4a819..8dbfcd5ba 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -315,8 +315,8 @@ BOOST_AUTO_TEST_CASE (reels_test6)
*/
BOOST_AUTO_TEST_CASE (reels_test7)
{
- auto A = content_factory("test/data/flat_red.png").front();
- auto B = content_factory("test/data/awkward_length.wav").front();
+ auto A = content_factory("test/data/flat_red.png")[0];
+ auto B = content_factory("test/data/awkward_length.wav")[0];
auto film = new_test_film2 ("reels_test7", { A, B });
film->set_video_frame_rate (24);
A->video->set_length (2 * 24);
@@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE (reels_test9)
make_and_verify_dcp (film);
auto B = make_shared<DCPContent>(film->dir(film->dcp_name()));
- auto film2 = new_test_film2("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml").front()});
+ auto film2 = new_test_film2("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml")[0]});
B->set_reference_video(true);
B->set_reference_audio(true);
film2->set_reel_type(ReelType::BY_VIDEO_CONTENT);
@@ -386,7 +386,7 @@ BOOST_AUTO_TEST_CASE (reels_test10)
/* Now try to make the VF; this used to fail */
auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
- auto vf = new_test_film2("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt").front()});
+ auto vf = new_test_film2("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt")[0]});
vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
ov_dcp->set_reference_video (true);
ov_dcp->set_reference_audio (true);