X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=8dbfcd5ba93c8cc4bad89546b2b458d48888defb;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=10fdc6c1ba440d845273dc724f64d4bcff1369af;hpb=922dc3605c29bd742a18b02fbe1faae5739b70df;p=dcpomatic.git

diff --git a/test/reels_test.cc b/test/reels_test.cc
index 10fdc6c1b..8dbfcd5ba 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -240,6 +240,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 BOOST_AUTO_TEST_CASE (reels_test5)
 {
 	auto dcp = make_shared<DCPContent>("test/data/reels_test4");
+	dcp->check_font_ids();
 	auto film = new_test_film2 ("reels_test5", {dcp});
 	film->set_sequence (false);
 
@@ -314,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);
@@ -350,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);
@@ -385,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);