diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-12-20 16:18:24 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-12-20 16:18:24 +0000 |
| commit | 3476f2f8251d5800abdd968963cac57b0df8a657 (patch) | |
| tree | dea2e82b66f7da44387023fe0c662253dfcec777 /test/vf_test.cc | |
| parent | f8e6fdee828647bc5a6a1cc7627052a072a37dc6 (diff) | |
Allow content factory to return multiple content.
Diffstat (limited to 'test/vf_test.cc')
| -rw-r--r-- | test/vf_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
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)); |