X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=de3f56d2ef99ea54ebcce452cac16b80ee89d99b;hb=refs%2Fheads%2Ftidy-eq-options;hp=5bee4a81918462bb45b3c26d260bd4698b04669d;hpb=8b9888ed8247109dc3c09492302e865fa4731460;p=dcpomatic.git

diff --git a/test/reels_test.cc b/test/reels_test.cc
index 5bee4a819..de3f56d2e 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -110,21 +110,21 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 
 	{
-		shared_ptr<ImageContent> c (new ImageContent("test/data/flat_red.png"));
+		auto c = make_shared<ImageContent>("test/data/flat_red.png");
 		film->examine_and_add_content (c);
 		BOOST_REQUIRE (!wait_for_jobs());
 		c->video->set_length (24);
 	}
 
 	{
-		shared_ptr<ImageContent> c (new ImageContent("test/data/flat_green.png"));
+		auto c = make_shared<ImageContent>("test/data/flat_green.png");
 		film->examine_and_add_content (c);
 		BOOST_REQUIRE (!wait_for_jobs());
 		c->video->set_length (24);
 	}
 
 	{
-		shared_ptr<ImageContent> c (new ImageContent("test/data/flat_blue.png"));
+		auto c = make_shared<ImageContent>("test/data/flat_blue.png");
 		film->examine_and_add_content (c);
 		BOOST_REQUIRE (!wait_for_jobs());
 		c->video->set_length (24);
@@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 	/* 4 piece of 1s-long content */
 	shared_ptr<ImageContent> content[4];
 	for (int i = 0; i < 4; ++i) {
-		content[i].reset (new ImageContent("test/data/flat_green.png"));
+		content[i] = make_shared<ImageContent>("test/data/flat_green.png");
 		film->examine_and_add_content (content[i]);
 		BOOST_REQUIRE (!wait_for_jobs());
 		content[i]->video->set_length (24);
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 	}
 
 	{
-		dcp->set_trim_start (ContentTime::from_seconds (0.5));
+		dcp->set_trim_start(film, ContentTime::from_seconds(0.5));
 		auto p = dcp->reels (film);
 		BOOST_REQUIRE_EQUAL (p.size(), 4U);
 		auto i = p.begin();
@@ -280,7 +280,7 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 	}
 
 	{
-		dcp->set_trim_start (ContentTime::from_seconds (1.5));
+		dcp->set_trim_start(film, ContentTime::from_seconds(1.5));
 		auto p = dcp->reels (film);
 		BOOST_REQUIRE_EQUAL (p.size(), 3U);
 		auto i = p.begin();
@@ -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);
@@ -411,7 +411,7 @@ BOOST_AUTO_TEST_CASE (reels_test11)
 	auto film = new_test_film2 ("reels_test11", {A});
 	film->set_video_frame_rate (24);
 	A->video->set_length (240);
-	A->set_video_frame_rate (24);
+	A->set_video_frame_rate(film, 24);
 	A->set_position (film, DCPTime::from_seconds(1));
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	make_and_verify_dcp (film);
@@ -440,11 +440,11 @@ BOOST_AUTO_TEST_CASE (reels_test12)
 	film->set_sequence (false);
 
 	A->video->set_length (240);
-	A->set_video_frame_rate (24);
+	A->set_video_frame_rate(film, 24);
 	A->set_position (film, DCPTime::from_seconds(1));
 
 	B->video->set_length (120);
-	B->set_video_frame_rate (24);
+	B->set_video_frame_rate(film, 24);
 	B->set_position (film, DCPTime::from_seconds(14));
 
 	auto r = film->reels ();
@@ -498,7 +498,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1)
 	make_and_verify_dcp (film);
 
 	vector<boost::filesystem::path> dirs = { film->dir(film->dcp_name(false)) };
-	auto notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
+	auto notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd());
 	dump_notes (notes);
 	BOOST_REQUIRE (notes.empty());
 }
@@ -523,7 +523,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2)
 	make_and_verify_dcp (film);
 
 	vector<boost::filesystem::path> dirs = { film->dir(film->dcp_name(false)) };
-	auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
+	auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd());
 	dump_notes (notes);
 	BOOST_REQUIRE (notes.empty());
 }
@@ -544,7 +544,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short3)
 
 	make_and_verify_dcp (film);
 
-	auto const notes = dcp::verify({}, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
+	auto const notes = dcp::verify({}, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd());
 	dump_notes (notes);
 	BOOST_REQUIRE (notes.empty());
 }
@@ -574,7 +574,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short4)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	vector<boost::filesystem::path> dirs = { film->dir(film->dcp_name(false)) };
-	auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
+	auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd());
 	dump_notes (notes);
 	BOOST_REQUIRE (notes.empty());
 }
@@ -617,7 +617,7 @@ BOOST_AUTO_TEST_CASE (repeated_dcp_into_reels)
 
 	for (int i = 0; i < 4; ++i) {
 		original_dcp[i]->set_position(film2, DCPTime::from_frames(total_frames * i / 4, frame_rate));
-		original_dcp[i]->set_trim_start(ContentTime::from_frames(total_frames * i / 4, frame_rate));
+		original_dcp[i]->set_trim_start(film2, ContentTime::from_frames(total_frames * i / 4, frame_rate));
 		original_dcp[i]->set_trim_end  (ContentTime::from_frames(total_frames * (4 - i - 1) / 4, frame_rate));
 		original_dcp[i]->set_reference_video(true);
 		original_dcp[i]->set_reference_audio(true);