Allow content factory to return multiple content.

6 files changed, 14 insertions, 14 deletions

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 8328c7cd2..ae5fd0834 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<Content> content = content_factory (film, private_data / "20 The Wedding Convoy Song.m4a");
+	shared_ptr<Content> content = content_factory(film, private_data / "20 The Wedding Convoy Song.m4a").front();
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index 273d04344..57852dcb9 100644
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE (audio_decoder_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<Content> content = content_factory (film, private_data / "20 The Wedding Convoy Song.m4a");
+	shared_ptr<Content> content = content_factory(film, private_data / "20 The Wedding Convoy Song.m4a").front();
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 01e80c783..e8c3f3597 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	film->examine_and_add_content (content_factory (film, "test/data/flat_white.png"));
+	film->examine_and_add_content (content_factory(film, "test/data/flat_white.png").front());
 	wait_for_jobs ();
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	film2->set_container (Ratio::from_id ("185"));
 	film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film2->set_name ("frobozz");
-	film2->examine_and_add_content (content_factory (film2, film->dir (film->dcp_name ())));
+	film2->examine_and_add_content (content_factory(film2, film->dir (film->dcp_name ())).front());
 	shared_ptr<TextSubtitleContent> sub = dynamic_pointer_cast<TextSubtitleContent> (
 		content_factory (film2, "test/data/subrip2.srt")
 		);
diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index 29e8ad05c..24ca4cac4 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -38,9 +38,9 @@ BOOST_AUTO_TEST_CASE (required_disk_space_test)
 	shared_ptr<Film> film = new_test_film ("required_disk_space_test");
 	film->set_j2k_bandwidth (100000000);
 	film->set_audio_channels (6);
-	shared_ptr<Content> content_a = content_factory (film, "test/data/flat_blue.png");
+	shared_ptr<Content> content_a = content_factory(film, "test/data/flat_blue.png").front();
 	film->examine_and_add_content (content_a);
-	shared_ptr<DCPContent> content_b = dynamic_pointer_cast<DCPContent> (content_factory (film, "test/data/burnt_subtitle_test_dcp"));
+	shared_ptr<DCPContent> content_b = dynamic_pointer_cast<DCPContent> (content_factory(film, "test/data/burnt_subtitle_test_dcp").front());
 	film->examine_and_add_content (content_b);
 	wait_for_jobs ();
 	film->write_metadata ();
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 8fbb9b9d4..f4f8fb2a6 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -84,11 +84,11 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 	shared_ptr<Film> ov = new_test_film ("vf_test2_ov");
 	ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	ov->set_name ("vf_test2_ov");
-	shared_ptr<Content> video = content_factory (ov, "test/data/flat_red.png");
+	shared_ptr<Content> video = content_factory (ov, "test/data/flat_red.png").front();
 	ov->examine_and_add_content (video);
 	wait_for_jobs ();
 	video->video->set_length (24 * 5);
-	shared_ptr<Content> audio = content_factory (ov, "test/data/white.wav");
+	shared_ptr<Content> audio = content_factory(ov, "test/data/white.wav").front();
 	ov->examine_and_add_content (audio);
 	wait_for_jobs ();
 	ov->make_dcp ();
@@ -99,13 +99,13 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 	vf->set_name ("vf_test2_vf");
 	vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
-	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory (vf, ov->dir (ov->dcp_name ())));
+	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory (vf, ov->dir (ov->dcp_name ())).front());
 	BOOST_REQUIRE (dcp);
 	vf->examine_and_add_content (dcp);
 	wait_for_jobs ();
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
-	shared_ptr<Content> sub = content_factory (vf, "test/data/subrip4.srt");
+	shared_ptr<Content> sub = content_factory(vf, "test/data/subrip4.srt").front();
 	vf->examine_and_add_content (sub);
 	vf->make_dcp ();
 	wait_for_jobs ();
@@ -141,11 +141,11 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 	shared_ptr<Film> ov = new_test_film ("vf_test3_ov");
 	ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	ov->set_name ("vf_test3_ov");
-	shared_ptr<Content> video = content_factory (ov, "test/data/flat_red.png");
+	shared_ptr<Content> video = content_factory(ov, "test/data/flat_red.png").front();
 	ov->examine_and_add_content (video);
 	wait_for_jobs ();
 	video->video->set_length (24 * 5);
-	shared_ptr<Content> audio = content_factory (ov, "test/data/white.wav");
+	shared_ptr<Content> audio = content_factory(ov, "test/data/white.wav").front();
 	ov->examine_and_add_content (audio);
 	wait_for_jobs ();
 	ov->make_dcp ();
@@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 	vf->set_name ("vf_test3_vf");
 	vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
-	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory (vf, ov->dir (ov->dcp_name ())));
+	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory(vf, ov->dir (ov->dcp_name ())).front());
 	BOOST_REQUIRE (dcp);
 	dcp->set_trim_start (ContentTime::from_seconds (1));
 	dcp->set_trim_end (ContentTime::from_seconds (1));
diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index 953e9b7b7..bdd35713c 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (video_mxf_content_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("video_mxf_content_test");
 
-	shared_ptr<Content> content = content_factory (film, ref_mxf);
+	shared_ptr<Content> content = content_factory(film, ref_mxf).front();
 	shared_ptr<VideoMXFContent> check = dynamic_pointer_cast<VideoMXFContent> (content);
 	BOOST_REQUIRE (check);
 	film->examine_and_add_content (content);