Change Film::examine_and_add_content to take a vector of content.

33 files changed, 115 insertions, 131 deletions

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index df040e134..af2e90745 100644
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -514,9 +514,7 @@ CreateCLI::make_film(function<void (string)> error) const
 			film_content_list = content_factory(can);
 		}
 
-		for (auto film_content: film_content_list) {
-			film->examine_and_add_content(film_content);
-		}
+		film->examine_and_add_content(film_content_list);
 
 		while (jm->work_to_do()) {
 			dcpomatic_sleep_seconds(1);
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 7401d1eac..a1ab3ccf3 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1423,16 +1423,25 @@ Film::content() const
  *  @param disable_audio_analysis true to never do automatic audio analysis, even if it is enabled in configuration.
  */
 void
-Film::examine_and_add_content(shared_ptr<Content> content, bool disable_audio_analysis)
+Film::examine_and_add_content(vector<shared_ptr<Content>> const& content, bool disable_audio_analysis)
 {
-	if (dynamic_pointer_cast<FFmpegContent>(content) && _directory) {
-		run_ffprobe(content->path(0), file("ffprobe.log"));
+	if (content.empty()) {
+		return;
+	}
+
+	if (dynamic_pointer_cast<FFmpegContent>(content[0]) && _directory) {
+		run_ffprobe(content[0]->path(0), file("ffprobe.log"));
 	}
 
-	auto j = make_shared<ExamineContentJob>(shared_from_this(), vector<shared_ptr<Content>>{content}, false);
+	auto j = make_shared<ExamineContentJob>(shared_from_this(), content, false);
+
+	vector<weak_ptr<Content>> weak_content;
+	for (auto i: content) {
+		weak_content.push_back(i);
+	}
 
 	_job_connections.push_back(
-		j->Finished.connect(bind(&Film::maybe_add_content, this, weak_ptr<Job>(j), vector<weak_ptr<Content>>{weak_ptr<Content>(content)}, disable_audio_analysis))
+		j->Finished.connect(bind(&Film::maybe_add_content, this, weak_ptr<Job>(j), weak_content, disable_audio_analysis))
 		);
 
 	JobManager::instance()->add(j);
diff --git a/src/lib/film.h b/src/lib/film.h
index e1a8e88a3..c4c55a12a 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -378,7 +378,7 @@ public:
 	void set_directory(boost::filesystem::path);
 	void set_name(std::string);
 	void set_use_isdcf_name(bool);
-	void examine_and_add_content(std::shared_ptr<Content> content, bool disable_audio_analysis = false);
+	void examine_and_add_content(std::vector<std::shared_ptr<Content>> const& content, bool disable_audio_analysis = false);
 	void add_content(std::vector<std::shared_ptr<Content>> const& content);
 	void remove_content(std::shared_ptr<Content>);
 	void remove_content(ContentList);
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index e7011fba1..8f8cf3df0 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1738,12 +1738,10 @@ private:
 			if (!_film_to_create.empty ()) {
 				_frame->new_film (_film_to_create, optional<string>());
 				if (!_content_to_add.empty()) {
-					for (auto i: content_factory(_content_to_add)) {
-						_frame->film()->examine_and_add_content(i);
-					}
+					_frame->film()->examine_and_add_content(content_factory(_content_to_add));
 				}
 				if (!_dcp_to_add.empty ()) {
-					_frame->film()->examine_and_add_content(make_shared<DCPContent>(_dcp_to_add));
+					_frame->film()->examine_and_add_content({make_shared<DCPContent>(_dcp_to_add)});
 				}
 			}
 
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 75326158d..32c5edb01 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -288,7 +288,7 @@ ContentMenu::join ()
 	try {
 		auto joined = make_shared<FFmpegContent>(fc);
 		film->remove_content (_content);
-		film->examine_and_add_content (joined);
+		film->examine_and_add_content({joined});
 	} catch (JoinError& e) {
 		error_dialog (_parent, std_to_wx (e.what ()));
 	}
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 06a257dbb..5803c3257 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -665,8 +665,9 @@ ContentPanel::add_folder(boost::filesystem::path folder)
 			ic->set_video_frame_rate(_film, dialog.frame_rate());
 		}
 
-		_film->examine_and_add_content(i);
 	}
+
+	_film->examine_and_add_content(content);
 }
 
 
@@ -684,7 +685,7 @@ void
 ContentPanel::add_dcp(boost::filesystem::path dcp)
 {
 	try {
-		_film->examine_and_add_content(make_shared<DCPContent>(dcp));
+		_film->examine_and_add_content({make_shared<DCPContent>(dcp)});
 	} catch (ProjectFolderError &) {
 		error_dialog(
 			_parent,
@@ -963,9 +964,7 @@ ContentPanel::add_files(vector<boost::filesystem::path> paths)
 
 	try {
 		for (auto i: paths) {
-			for (auto j: content_factory(i)) {
-				_film->examine_and_add_content(j);
-			}
+			_film->examine_and_add_content(content_factory(i));
 		}
 	} catch (exception& e) {
 		error_dialog(_parent, std_to_wx(e.what()));
diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 41f0abead..2ae91a90f 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -172,7 +172,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test)
 	auto film = new_test_film("analyse_audio_leqm_test");
 	film->set_audio_channels (2);
 	auto content = content_factory(TestPaths::private_data() / "betty_stereo_48k.wav")[0];
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	auto playlist = make_shared<Playlist>();
diff --git a/test/content_test.cc b/test/content_test.cc
index b9a25a02b..b6c6703c5 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (content_test4)
 	auto film = new_test_film("content_test4");
 
 	auto video = content_factory("test/data/count300bd24.m2ts")[0];
-	film->examine_and_add_content (video);
+	film->examine_and_add_content({video});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	video->set_trim_end (dcpomatic::ContentTime(3000));
diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index 5e31856eb..cf9950aae 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
 	auto encrypted = new_test_film("check_reuse_old_data_decrypted");
-	encrypted->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
+	encrypted->examine_and_add_content(content_factory("test/data/flat_red.png"));
 	BOOST_REQUIRE (!wait_for_jobs());
 	encrypted->set_encrypted (true);
 	make_and_verify_dcp (encrypted);
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	*/
 	auto test = new_test_film("check_reuse_old_data_test1");
 	ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
-	test->examine_and_add_content (ov_content);
+	test->examine_and_add_content({ov_content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	auto player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	*/
 	test = new_test_film("check_reuse_old_data_test2");
 	auto vf_content = make_shared<DCPContent>(vf->dir(vf->dcp_name(false)));
-	test->examine_and_add_content (vf_content);
+	test->examine_and_add_content({vf_content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	/* Add a KDM to an encrypted DCP and check that the _reels did not get reused */
 	test = new_test_film("check_reuse_old_data_test3");
 	auto encrypted_content = make_shared<DCPContent>(encrypted->dir(encrypted->dcp_name(false)));
-	test->examine_and_add_content (encrypted_content);
+	test->examine_and_add_content({encrypted_content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
diff --git a/test/empty_test.cc b/test/empty_test.cc
index 922d6a5b1..50849a1ec 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -60,8 +60,7 @@ BOOST_AUTO_TEST_CASE (empty_test1)
 	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 
-	film->examine_and_add_content (contentA);
-	film->examine_and_add_content (contentB);
+	film->examine_and_add_content({contentA, contentB});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	int const vfr = film->video_frame_rate ();
@@ -93,8 +92,7 @@ BOOST_AUTO_TEST_CASE (empty_test2)
 	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 
-	film->examine_and_add_content (contentA);
-	film->examine_and_add_content (contentB);
+	film->examine_and_add_content({contentA, contentB});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	int const vfr = film->video_frame_rate ();
@@ -132,8 +130,7 @@ BOOST_AUTO_TEST_CASE (empty_test3)
 	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 
-	film->examine_and_add_content (contentA);
-	film->examine_and_add_content (contentB);
+	film->examine_and_add_content({contentA, contentB});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	int const vfr = film->video_frame_rate ();
@@ -165,8 +162,7 @@ BOOST_AUTO_TEST_CASE (empty_test_with_overlapping_content)
 	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 
-	film->examine_and_add_content (contentA);
-	film->examine_and_add_content (contentB);
+	film->examine_and_add_content({contentA, contentB});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	int const vfr = film->video_frame_rate ();
diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index a106b7dde..bfc7ca8af 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 {
 	auto film = new_test_film("ffmpeg_audio_test2");
 	auto content = content_factory(TestPaths::private_data() / "wayne.mkv")[0];
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 {
 	auto film = new_test_film("ffmpeg_audio_test3");
 	auto content = content_factory(TestPaths::private_data() / "wayne.mkv")[0];
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4)
 {
 	auto film = new_test_film("ffmpeg_audio_test4");
 	auto content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv")[0];
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 9865d093d..cb4f3cfea 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -296,17 +296,17 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 {
 	auto film = new_test_film("ffmpeg_encoder_h264_test6_ov");
-	film->examine_and_add_content (make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png"));
+	film->examine_and_add_content({make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png")});
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (film);
 
 	auto film2 = new_test_film("ffmpeg_encoder_h264_test6_vf");
 	auto ov = make_shared<DCPContent>("build/test/ffmpeg_encoder_h264_test6_ov/" + film->dcp_name(false));
-	film2->examine_and_add_content (ov);
+	film2->examine_and_add_content({ov});
 	BOOST_REQUIRE (!wait_for_jobs());
 	ov->set_reference_video (true);
 	auto subs = content_factory("test/data/subrip.srt")[0];
-	film2->examine_and_add_content (subs);
+	film2->examine_and_add_content({subs});
 	BOOST_REQUIRE (!wait_for_jobs());
 	for (auto i: subs->text) {
 		i->set_use (true);
@@ -374,7 +374,7 @@ BOOST_AUTO_TEST_CASE(ffmpeg_encoder_2d_content_in_3d_project)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 {
 	auto film = new_test_film("ffmpeg_encoder_h264_test4");
-	film->examine_and_add_content(make_shared<DCPContent>("test/data/scope_dcp"));
+	film->examine_and_add_content({make_shared<DCPContent>("test/data/scope_dcp")});
 	BOOST_REQUIRE(!wait_for_jobs());
 	film->set_audio_channels (2);
 
@@ -393,7 +393,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (12);
 
-	film->examine_and_add_content (c);
+	film->examine_and_add_content({c});
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	c->video->set_length (240);
diff --git a/test/film_test.cc b/test/film_test.cc
index 820c15624..5ce195637 100644
--- a/test/film_test.cc
+++ b/test/film_test.cc
@@ -55,12 +55,12 @@ BOOST_AUTO_TEST_CASE(film_possible_reel_types_test1)
 	auto film = new_test_film("film_possible_reel_types_test1");
 	BOOST_CHECK_EQUAL(film->possible_reel_types().size(), 4U);
 
-	film->examine_and_add_content(content_factory("test/data/flat_red.png")[0]);
+	film->examine_and_add_content(content_factory("test/data/flat_red.png"));
 	BOOST_REQUIRE(!wait_for_jobs());
 	BOOST_CHECK_EQUAL(film->possible_reel_types().size(), 4U);
 
 	auto dcp = make_shared<DCPContent>("test/data/reels_test2");
-	film->examine_and_add_content(dcp);
+	film->examine_and_add_content({dcp});
 	BOOST_REQUIRE(!wait_for_jobs());
 	BOOST_CHECK_EQUAL(film->possible_reel_types().size(), 4U);
 
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(film_possible_reel_types_test2)
 	auto film = new_test_film("film_possible_reel_types_test2");
 
 	auto dcp = make_shared<DCPContent>("test/data/dcp_digest_test_dcp");
-	film->examine_and_add_content(dcp);
+	film->examine_and_add_content({dcp});
 	BOOST_REQUIRE(!wait_for_jobs());
 	BOOST_CHECK_EQUAL(film->possible_reel_types().size(), 4U);
 
diff --git a/test/hints_test.cc b/test/hints_test.cc
index 53c126fde..eaa034066 100644
--- a/test/hints_test.cc
+++ b/test/hints_test.cc
@@ -76,7 +76,7 @@ check (TextType type, string name, optional<string> expected_hint = optional<str
 	auto content = content_factory("test/data/" + name + ".srt")[0];
 	content->text.front()->set_type (type);
 	content->text.front()->set_language (dcp::LanguageTag("en-US"));
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	auto hints = get_hints (film);
 
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE (hint_subtitle_mxf_too_big)
 		auto content = content_factory(fmt::format("test/data/{}{}.xml", name, i))[0];
 		content->text[0]->set_type(TextType::OPEN_SUBTITLE);
 		content->text[0]->set_language(dcp::LanguageTag("en-US"));
-		film->examine_and_add_content(content);
+		film->examine_and_add_content({content});
 		BOOST_REQUIRE (!wait_for_jobs());
 		auto const font = content->text[0]->get_font(fmt::format("font_{}", i));
 		BOOST_REQUIRE(font);
@@ -234,7 +234,7 @@ BOOST_AUTO_TEST_CASE (hint_closed_caption_xml_too_big)
 	auto content = content_factory("build/test/" + name + ".srt")[0];
 	content->text.front()->set_type (TextType::CLOSED_CAPTION);
 	content->text.front()->set_language (dcp::LanguageTag("en-US"));
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	auto hints = get_hints (film);
 
@@ -250,8 +250,8 @@ BOOST_AUTO_TEST_CASE (hint_closed_caption_xml_too_big)
 BOOST_AUTO_TEST_CASE (hints_destroyed_while_running)
 {
 	auto film = new_test_film("hints_destroyed_while_running");
-	auto content = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
-	film->examine_and_add_content (content);
+	auto content = content_factory(TestPaths::private_data() / "boon_telly.mkv");
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	auto hints = make_shared<Hints>(film);
diff --git a/test/image_content_fade_test.cc b/test/image_content_fade_test.cc
index 5ac63405a..70d72871e 100644
--- a/test/image_content_fade_test.cc
+++ b/test/image_content_fade_test.cc
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE (image_content_fade_test)
 {
 	auto film = new_test_film("image_content_fade_test");
 	auto content = content_factory("test/data/flat_red.png")[0];
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	content->video->set_fade_in (1);
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index e9f7f068b..8782e7f73 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
 	/* Make a DCP with some ratings and a content version */
 	auto film = new_test_film("import_dcp_metadata_test");
 	auto content = content_factory("test/data/flat_red.png")[0];
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	content->video->set_length (10);
@@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
 	/* Import the DCP to a new film and check the metadata */
 	auto film2 = new_test_film("import_dcp_metadata_test2");
 	auto imported = make_shared<DCPContent>(film->dir(film->dcp_name()));
-	film2->examine_and_add_content (imported);
+	film2->examine_and_add_content({imported});
 	BOOST_REQUIRE (!wait_for_jobs());
 	film2->write_metadata ();
 
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index b0cc568cd..71dd0c108 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	BOOST_REQUIRE_EQUAL (text->text.size(), 1U);
 	text->text[0]->set_burn(true);
 	text->text[0]->set_language(dcp::LanguageTag("fr-FR"));
-	film->examine_and_add_content (text);
+	film->examine_and_add_content({text});
 	film->set_version_number(2);
 	film->set_release_territory(dcp::LanguageTag::RegionSubtag("US"));
 	film->set_ratings({dcp::Rating("MPA", "R")});
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->set_facility (string("ppfacility"));
 	BOOST_REQUIRE (!wait_for_jobs());
 	audio = content_factory("test/data/sine_440.wav")[0];
-	film->examine_and_add_content (audio);
+	film->examine_and_add_content({audio});
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->set_audio_language (dcp::LanguageTag("de-DE"));
 	film->set_interop (false);
@@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	/* Test interior aspect ratio: shouldn't be shown with trailers */
 
 	auto content = std::make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	content->video->set_custom_ratio (1.33);
 	film->set_container (Ratio::from_id ("185"));
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 
 	film->set_audio_channels (6);
 	auto sound = make_shared<FFmpegContent>("test/data/sine_440.wav");
-	film->examine_and_add_content (sound);
+	film->examine_and_add_content({sound});
 	BOOST_REQUIRE (!wait_for_jobs());
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_10_4K_DI_20140704_PPF_SMPTE_OV");
 
diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index e8bafb6a2..2308e6ac6 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	boost::filesystem::remove_all ("build/test/single_kdm_naming_test");
 	auto film = new_test_film("single_kdm_naming_test");
 	film->set_name ("my_great_film");
-	film->examine_and_add_content (content_factory("test/data/flat_black.png")[0]);
+	film->examine_and_add_content(content_factory("test/data/flat_black.png"));
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->set_encrypted (true);
 	make_and_verify_dcp (film);
diff --git a/test/markers_test.cc b/test/markers_test.cc
index 6e5f9d8df..38137223f 100644
--- a/test/markers_test.cc
+++ b/test/markers_test.cc
@@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1)
 {
 	string const name = "automatic_ffoc_lfoc_markers_test1";
 	auto film = new_test_film(name);
-	film->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
+	film->examine_and_add_content(content_factory("test/data/flat_red.png"));
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_interop (false);
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test2)
 {
 	string const name = "automatic_ffoc_lfoc_markers_test2";
 	auto film = new_test_film(name);
-	film->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
+	film->examine_and_add_content(content_factory("test/data/flat_red.png"));
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_interop (false);
diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc
index 441d64166..7ac02afc4 100644
--- a/test/no_use_video_test.cc
+++ b/test/no_use_video_test.cc
@@ -53,8 +53,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test1)
 	auto film = new_test_film("no_use_video_test1");
 	auto A = content_factory("test/data/flat_red.png")[0];
 	auto B = content_factory("test/data/flat_green.png")[0];
-	film->examine_and_add_content (A);
-	film->examine_and_add_content (B);
+	film->examine_and_add_content({A, B});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	A->set_position (film, dcpomatic::DCPTime());
@@ -100,8 +99,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test3)
 	BOOST_REQUIRE (ov_a_pic);
 	auto ov_a_snd = content_factory("test/data/sine_16_48_220_10.wav")[0];
 	BOOST_REQUIRE (ov_a_snd);
-	ov_a->examine_and_add_content (ov_a_pic);
-	ov_a->examine_and_add_content (ov_a_snd);
+	ov_a->examine_and_add_content({ov_a_pic, ov_a_snd});
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (ov_a);
 
@@ -110,16 +108,14 @@ BOOST_AUTO_TEST_CASE (no_use_video_test3)
 	BOOST_REQUIRE (ov_b_pic);
 	auto ov_b_snd = content_factory("test/data/sine_16_48_880_10.wav")[0];
 	BOOST_REQUIRE (ov_b_snd);
-	ov_b->examine_and_add_content (ov_b_pic);
-	ov_b->examine_and_add_content (ov_b_snd);
+	ov_b->examine_and_add_content({ov_b_pic, ov_b_snd});
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (ov_b);
 
 	auto vf = new_test_film("no_use_video_test3_vf");
 	auto A = make_shared<DCPContent>(ov_a->dir(ov_a->dcp_name()));
 	auto B = make_shared<DCPContent>(ov_b->dir(ov_b->dcp_name()));
-	vf->examine_and_add_content (A);
-	vf->examine_and_add_content (B);
+	vf->examine_and_add_content({A, B});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	A->set_position (vf, dcpomatic::DCPTime());
diff --git a/test/player_test.cc b/test/player_test.cc
index 788633796..acbd019dc 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 {
 	auto film = std::make_shared<Film>(optional<boost::filesystem::path>());
 	auto dcp = std::make_shared<DCPContent>(TestPaths::private_data() / "awkward_subs");
-	film->examine_and_add_content (dcp, true);
+	film->examine_and_add_content({dcp}, true);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	dcp->only_text()->set_use (true);
 
@@ -239,7 +239,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 {
 	auto film = std::make_shared<Film>(optional<boost::filesystem::path>());
 	auto dcp = std::make_shared<DCPContent>(TestPaths::private_data() / "awkward_subs2");
-	film->examine_and_add_content (dcp, true);
+	film->examine_and_add_content({dcp}, true);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	dcp->only_text()->set_use (true);
 
@@ -272,11 +272,11 @@ BOOST_AUTO_TEST_CASE (player_trim_test)
 {
        auto film = new_test_film("player_trim_test");
        auto A = content_factory("test/data/flat_red.png")[0];
-       film->examine_and_add_content (A);
+       film->examine_and_add_content({A});
        BOOST_REQUIRE (!wait_for_jobs ());
        A->video->set_length (10 * 24);
        auto B = content_factory("test/data/flat_red.png")[0];
-       film->examine_and_add_content (B);
+       film->examine_and_add_content({B});
        BOOST_REQUIRE (!wait_for_jobs ());
        B->video->set_length (10 * 24);
        B->set_position (film, DCPTime::from_seconds(10));
@@ -311,9 +311,9 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 {
 	auto film = new_test_film("player_ignore_video_and_audio_test");
 	auto ff = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
-	film->examine_and_add_content (ff);
+	film->examine_and_add_content({ff});
 	auto text = content_factory("test/data/subrip.srt")[0];
-	film->examine_and_add_content (text);
+	film->examine_and_add_content({text});
 	BOOST_REQUIRE (!wait_for_jobs());
 	text->only_text()->set_type (TextType::CLOSED_CAPTION);
 	text->only_text()->set_use (true);
@@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
 {
 	auto film = new_test_film("player_trim_crash");
 	auto boon = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
-	film->examine_and_add_content (boon);
+	film->examine_and_add_content({boon});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	Player player(film, Image::Alignment::COMPACT, false);
@@ -377,9 +377,9 @@ BOOST_AUTO_TEST_CASE (player_3d_test_1)
 {
 	auto film = new_test_film("player_3d_test_1a");
 	auto left = content_factory("test/data/flat_red.png")[0];
-	film->examine_and_add_content (left);
+	film->examine_and_add_content({left});
 	auto right = content_factory("test/data/flat_blue.png")[0];
-	film->examine_and_add_content (right);
+	film->examine_and_add_content({right});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	left->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
@@ -446,7 +446,7 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash)
 
 	BOOST_REQUIRE (video);
 	auto content3 = content_factory(*video)[0];
-	film2->examine_and_add_content (content3);
+	film2->examine_and_add_content({content3});
 	BOOST_REQUIRE (!wait_for_jobs());
 	content3->set_position (film2, DCPTime::from_seconds(1.5));
 	film2->set_video_frame_rate (24);
diff --git a/test/reels_test.cc b/test/reels_test.cc
index 9ef5fbb9d..fcb1aee44 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -191,13 +191,13 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 	shared_ptr<ImageContent> content[4];
 	for (int i = 0; i < 4; ++i) {
 		content[i] = make_shared<ImageContent>("test/data/flat_green.png");
-		film->examine_and_add_content (content[i]);
+		film->examine_and_add_content({content[i]});
 		BOOST_REQUIRE (!wait_for_jobs());
 		content[i]->video->set_length (24);
 	}
 
 	auto subs = make_shared<StringTextFileContent>("test/data/subrip3.srt");
-	film->examine_and_add_content (subs);
+	film->examine_and_add_content({subs});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_audio_channels(16);
@@ -663,7 +663,7 @@ BOOST_AUTO_TEST_CASE(reel_assets_same_length_with_atmos)
 	});
 
 	auto picture = content_factory("test/data/flat_red.png")[0];
-	film->examine_and_add_content(picture);
+	film->examine_and_add_content({picture});
 	wait_for_jobs();
 	picture->video->set_length(480);
 
diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index c46a4f70d..0528f8e75 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
 	auto film = new_test_film("remake_with_subtitle_test");
 	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv")[0]);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs ());
 	content->only_text()->set_burn (true);
 	content->only_text()->set_use (true);
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 7af5426dc..2cc477913 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 		content->only_text()->set_use (true);
 		content->only_text()->set_burn (false);
 		content->only_text()->set_language(dcp::LanguageTag("de"));
-		film->examine_and_add_content (content);
+		film->examine_and_add_content({content});
 		BOOST_REQUIRE (!wait_for_jobs());
 		content->set_position (film, DCPTime());
 	}
diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index d21f7c450..47cbb94d1 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
 	film->set_name ("frobozz");
 	film->set_interop (true);
 	auto content = make_shared<StringTextFileContent>(TestPaths::private_data() / "DKH_UT_EN20160601def.ssa");
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	content->only_text()->set_use (true);
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"));
 
diff --git a/test/template_test.cc b/test/template_test.cc
index 064a070c1..7a34b6f99 100644
--- a/test/template_test.cc
+++ b/test/template_test.cc
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(template_wrong_channel_counts)
 	film->use_template(string("Bug"));
 
 	auto mono = content_factory("test/data/C.wav").front();
-	film->examine_and_add_content(mono);
+	film->examine_and_add_content({mono});
 	BOOST_REQUIRE(!wait_for_jobs());
 
 	BOOST_REQUIRE_EQUAL(mono->audio->streams().size(), 1U);
diff --git a/test/test.cc b/test/test.cc
index c6f1a210f..143b00ca2 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -219,10 +219,8 @@ new_test_film(string name, vector<shared_ptr<Content>> content, Cleanup* cleanup
 	film->set_container (Ratio::from_id ("185"));
 	film->write_metadata ();
 
-	for (auto i: content) {
-		film->examine_and_add_content (i);
-		BOOST_REQUIRE (!wait_for_jobs());
-	}
+	film->examine_and_add_content(content);
+	BOOST_REQUIRE(!wait_for_jobs());
 
 	return film;
 }
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 2f92d5b7a..bc6f83f59 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -89,9 +89,8 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 {
 	auto film = new_test_film("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
-	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
-	film->examine_and_add_content (R);
+	film->examine_and_add_content({L, R});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
@@ -108,9 +107,8 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 
 	auto film = new_test_film("threed_test4");
 	auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov");
-	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>(TestPaths::private_data() / "RIGHT_TEST_DCP3D4K.mov");
-	film->examine_and_add_content (R);
+	film->examine_and_add_content({L, R});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
@@ -137,9 +135,8 @@ BOOST_AUTO_TEST_CASE (threed_test5)
 {
 	auto film = new_test_film("threed_test5");
 	auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
-	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
-	film->examine_and_add_content (R);
+	film->examine_and_add_content({L, R});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
@@ -159,9 +156,8 @@ BOOST_AUTO_TEST_CASE (threed_test6)
 {
 	auto film = new_test_film("threed_test6");
 	auto L = make_shared<FFmpegContent>("test/data/3dL.mp4");
-	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/3dR.mp4");
-	film->examine_and_add_content (R);
+	film->examine_and_add_content({L, R});
 	film->set_audio_channels(16);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -182,7 +178,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	auto film = new_test_film("threed_test7");
 	path const content_path = "test/data/flat_red.png";
 	auto c = content_factory(content_path)[0];
-	film->examine_and_add_content (c);
+	film->examine_and_add_content({c});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	c->video->set_frame_type (VideoFrameType::THREE_D);
@@ -224,9 +220,8 @@ BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths)
 {
 	auto film = new_test_film("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
-	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
-	film->examine_and_add_content (R);
+	film->examine_and_add_content({L, R});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
@@ -245,9 +240,8 @@ BOOST_AUTO_TEST_CASE (threed_test_separate_files_very_different_lengths)
 {
 	auto film = new_test_film("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
-	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
-	film->examine_and_add_content (R);
+	film->examine_and_add_content({L, R});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
@@ -263,9 +257,8 @@ BOOST_AUTO_TEST_CASE (threed_test_butler_overfill)
 {
 	auto film = new_test_film("threed_test_butler_overfill");
 	auto A = make_shared<FFmpegContent>(TestPaths::private_data() / "arrietty_JP-EN.mkv");
-	film->examine_and_add_content(A);
 	auto B = make_shared<FFmpegContent>(TestPaths::private_data() / "arrietty_JP-EN.mkv");
-	film->examine_and_add_content(B);
+	film->examine_and_add_content({A, B});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	Player player(film, Image::Alignment::COMPACT, false);
diff --git a/test/torture_test.cc b/test/torture_test.cc
index e2325955b..f03f6d4e5 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
 	/* Staircase at an offset of 2000 samples, trimmed both start and end, with a gain of exactly 2 (linear) */
 	auto staircase = content_factory("test/data/staircase.wav")[0];
-	film->examine_and_add_content (staircase);
+	film->examine_and_add_content({staircase});
 	BOOST_REQUIRE (!wait_for_jobs());
 	staircase->set_position (film, DCPTime::from_frames(2000, film->audio_frame_rate()));
 	staircase->set_trim_start(film, ContentTime::from_frames(12, 48000));
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
 	/* And again at an offset of 50000 samples, trimmed both start and end, with a gain of exactly 2 (linear) */
 	staircase = content_factory("test/data/staircase.wav")[0];
-	film->examine_and_add_content (staircase);
+	film->examine_and_add_content({staircase});
 	BOOST_REQUIRE (!wait_for_jobs());
 	staircase->set_position (film, DCPTime::from_frames(50000, film->audio_frame_rate()));
 	staircase->set_trim_start(film, ContentTime::from_frames(12, 48000));
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
 	/* 1s of red at 5s in */
 	auto red = content_factory("test/data/flat_red.png")[0];
-	film->examine_and_add_content (red);
+	film->examine_and_add_content({red});
 	BOOST_REQUIRE (!wait_for_jobs());
 	red->set_position (film, DCPTime::from_seconds(5));
 	red->video->set_length (24);
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 61024982a..4415b79a5 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (vf_test1)
 	BOOST_CHECK (!dcp->can_reference_text(film, TextType::CLOSED_CAPTION, why_not));
 
 	auto other = make_shared<FFmpegContent>("test/data/test.mp4");
-	film->examine_and_add_content (other);
+	film->examine_and_add_content({other});
 	BOOST_REQUIRE (!wait_for_jobs());
 	BOOST_CHECK (!other->audio);
 
@@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
 	auto more_video = content_factory("test/data/flat_red.png")[0];
-	vf->examine_and_add_content (more_video);
+	vf->examine_and_add_content({more_video});
 	BOOST_REQUIRE (!wait_for_jobs());
 	more_video->set_position (vf, DCPTime());
 	make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
@@ -248,7 +248,7 @@ BOOST_AUTO_TEST_CASE (vf_test5)
 	ov->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	for (int i = 0; i < 3; ++i) {
 		auto video = content_factory("test/data/flat_red.png")[0];
-		ov->examine_and_add_content (video);
+		ov->examine_and_add_content({video});
 		BOOST_REQUIRE (!wait_for_jobs());
 		video->video->set_length (24 * 10);
 	}
@@ -300,7 +300,7 @@ BOOST_AUTO_TEST_CASE (vf_test6)
 	dcp->set_reference_audio (true);
 
 	auto sub = content_factory("test/data/15s.srt")[0];
-	vf->examine_and_add_content (sub);
+	vf->examine_and_add_content({sub});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	make_and_verify_dcp (
@@ -497,7 +497,7 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels)
 	vf->set_dcp_content_type(DCPContentType::from_isdcf_name("TST"));
 	vf->set_container(Ratio::from_id("185"));
 	vf->write_metadata();
-	vf->examine_and_add_content(dcp_ov);
+	vf->examine_and_add_content({dcp_ov});
 	BOOST_REQUIRE(!wait_for_jobs());
 	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	dcp_ov->set_reference_video(true);
diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index 01f93bfcb..82038e33b 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -313,7 +313,7 @@ movie_V (string name)
 	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mp4")[0]);
 	BOOST_REQUIRE (content);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	auto range = pixel_range (film, content);
@@ -332,7 +332,7 @@ movie_VoF (string name)
 	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mp4")[0]);
 	BOOST_REQUIRE (content);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	content->video->set_range (VideoRange::FULL);
 
@@ -351,7 +351,7 @@ movie_F (string name)
 	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mov")[0]);
 	BOOST_REQUIRE (content);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	BOOST_CHECK(content->video->range() == VideoRange::FULL);
@@ -371,7 +371,7 @@ movie_FoV (string name)
 	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mov")[0]);
 	BOOST_REQUIRE (content);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	content->video->set_range (VideoRange::VIDEO);
 
@@ -390,7 +390,7 @@ image_F (string name)
 	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<ImageContent>(content_factory("test/data/rgb_grey_testcard.png")[0]);
 	BOOST_REQUIRE (content);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	auto range = pixel_range (film, content);
@@ -408,7 +408,7 @@ image_FoV (string name)
 	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<ImageContent>(content_factory("test/data/rgb_grey_testcard.png")[0]);
 	BOOST_REQUIRE (content);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 	content->video->set_range (VideoRange::VIDEO);
 
@@ -430,7 +430,7 @@ dcp_F (string name)
 	boost::filesystem::path const dcp = "test/data/RgbGreyTestcar_TST-1_F_MOS_2K_20201115_SMPTE_OV";
 	auto film = new_test_film(name);
 	auto content = make_shared<DCPContent>(dcp);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	auto range = pixel_range (dcp);
@@ -469,7 +469,7 @@ V_movie_range (shared_ptr<Film> film)
 
 	/* This is a bit of a hack; add the exported file into the project so we can decode it */
 	auto content = make_shared<FFmpegContent>(film->file("export.mov"));
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	return pixel_range (film, content);
diff --git a/test/writer_test.cc b/test/writer_test.cc
index b4ef93c1d..6c311437e 100644
--- a/test/writer_test.cc
+++ b/test/writer_test.cc
@@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE (interrupt_writer)
 	auto film = new_test_film("test_interrupt_writer", {}, &cl);
 
 	auto content = content_factory("test/data/check_image0.png")[0];
-	film->examine_and_add_content (content);
+	film->examine_and_add_content({content});
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Add some dummy content to the film so that it has a reel of the right length */