Run all tests with lots of encoding threads.

[dcpomatic.git] / test / vf_test.cc

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 915ca5c8c7f98a6fb513c8bb3f712587217187cf..6fd0a00e8de3c8596355d38d3943ff14f50a71f0 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -75,13 +75,11 @@ BOOST_AUTO_TEST_CASE (vf_test1)
        shared_ptr<FFmpegContent> other (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (other);
        BOOST_REQUIRE (!wait_for_jobs());
+       BOOST_CHECK (!other->audio);
 
-       /* Not possible if there is overlap */
+       /* Not possible if there is overlap; we only check video here as that's all test.mp4 has */
        other->set_position (film, DCPTime());
        BOOST_CHECK (!dcp->can_reference_video(film, why_not));
-       BOOST_CHECK (!dcp->can_reference_audio(film, why_not));
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_OPEN_SUBTITLE, why_not));
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_CLOSED_CAPTION, why_not));
 
        /* This should not be considered an overlap */
        other->set_position (film, dcp->end(film));
@@ -289,7 +287,7 @@ BOOST_AUTO_TEST_CASE (vf_test5)
        BOOST_REQUIRE (!wait_for_jobs());
 
        /* Check that the selected reel assets are right */
-       shared_ptr<Player> player (new Player(vf, vf->playlist()));
+       shared_ptr<Player> player (new Player(vf));
        list<ReferencedReelAsset> a = player->get_reel_assets();
        BOOST_REQUIRE_EQUAL (a.size(), 4);
        list<ReferencedReelAsset>::const_iterator i = a.begin();