Supporters update.

[dcpomatic.git] / test / no_use_video_test.cc

diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc
index 2cc914f84f1c4d619819c9480ecc7d9f3bf4d20a..d9e2c7c0052f0c1195f5e82c483c456ac7e61674 100644 (file)
--- a/test/no_use_video_test.cc
+++ b/test/no_use_video_test.cc
@@ -43,7 +43,6 @@
 
 using std::dynamic_pointer_cast;
 using std::make_shared;
-using std::shared_ptr;
 
 
 /** Overlay two video-only bits of content, don't use the video on one and
@@ -52,8 +51,8 @@ using std::shared_ptr;
 BOOST_AUTO_TEST_CASE (no_use_video_test1)
 {
        auto film = new_test_film2 ("no_use_video_test1");
-       auto A = content_factory("test/data/flat_red.png").front();
-       auto B = content_factory("test/data/flat_green.png").front();
+       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);
        BOOST_REQUIRE (!wait_for_jobs());
@@ -62,6 +61,8 @@ BOOST_AUTO_TEST_CASE (no_use_video_test1)
        B->set_position (film, dcpomatic::DCPTime());
        A->video->set_use (false);
 
+       film->set_audio_channels(16);
+
        make_and_verify_dcp (film);
 
        check_dcp ("test/data/no_use_video_test1", film);
@@ -72,8 +73,8 @@ BOOST_AUTO_TEST_CASE (no_use_video_test1)
 BOOST_AUTO_TEST_CASE (no_use_video_test2)
 {
        auto film = new_test_film2 ("no_use_video_test2");
-       auto A = content_factory (TestPaths::private_data() / "dolby_aurora.vob").front();
-       auto B = content_factory (TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov").front();
+       auto A = content_factory(TestPaths::private_data() / "dolby_aurora.vob")[0];
+       auto B = content_factory(TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov")[0];
        film->examine_and_add_content (A);
        film->examine_and_add_content (B);
        BOOST_REQUIRE (!wait_for_jobs());
@@ -82,6 +83,8 @@ BOOST_AUTO_TEST_CASE (no_use_video_test2)
        B->set_position (film, dcpomatic::DCPTime());
        A->video->set_use (false);
 
+       film->set_audio_channels(16);
+
        make_and_verify_dcp (film);
 
        check_dcp (TestPaths::private_data() / "no_use_video_test2", film);
@@ -92,9 +95,9 @@ BOOST_AUTO_TEST_CASE (no_use_video_test2)
 BOOST_AUTO_TEST_CASE (no_use_video_test3)
 {
        auto ov_a = new_test_film2 ("no_use_video_test3_ov_a");
-       auto ov_a_pic = content_factory("test/data/flat_red.png").front();
+       auto ov_a_pic = content_factory("test/data/flat_red.png")[0];
        BOOST_REQUIRE (ov_a_pic);
-       auto ov_a_snd = content_factory("test/data/sine_16_48_220_10.wav").front();
+       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);
@@ -102,9 +105,9 @@ BOOST_AUTO_TEST_CASE (no_use_video_test3)
        make_and_verify_dcp (ov_a);
 
        auto ov_b = new_test_film2("no_use_video_test3_ov_b");
-       auto ov_b_pic = content_factory("test/data/flat_green.png").front();
+       auto ov_b_pic = content_factory("test/data/flat_green.png")[0];
        BOOST_REQUIRE (ov_b_pic);
-       auto ov_b_snd = content_factory("test/data/sine_16_48_880_10.wav").front();
+       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);
@@ -128,7 +131,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test3)
        A->set_reference_audio (true);
        B->set_reference_video (true);
 
-       make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
+       make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
        dcp::DCP ov_a_check (ov_a->dir(ov_a->dcp_name()));
        ov_a_check.read ();