Missing library from test link list.

[dcpomatic.git] / test / frame_rate_test.cc

diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 4192ce5e2d3da0ce88207d659c5483f346b04ac4..292dff8dbb05b2b290cb152e326023d9f9120b89 100644 (file)
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
        /* Get any piece of content, it doesn't matter what */
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        /* Run some tests with a limited range of allowed rates */
 
@@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
        Config::instance()->set_allowed_dcp_frame_rates (afr);
 
        content->_video_frame_rate = 60;
-       best = film->best_video_frame_rate ();
+       best = film->playlist()->best_video_frame_rate ();
        frc = FrameRateChange (60, best);
        BOOST_CHECK_EQUAL (best, 60);
        BOOST_CHECK_EQUAL (frc.skip, false);
@@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
        BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
        content->_video_frame_rate = 50;
-       best = film->best_video_frame_rate ();
+       best = film->playlist()->best_video_frame_rate ();
        frc = FrameRateChange (50, best);
        BOOST_CHECK_EQUAL (best, 50);
        BOOST_CHECK_EQUAL (frc.skip, false);
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
        BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
        content->_video_frame_rate = 48;
-       best = film->best_video_frame_rate ();
+       best = film->playlist()->best_video_frame_rate ();
        frc = FrameRateChange (48, best);
        BOOST_CHECK_EQUAL (best, 48);
        BOOST_CHECK_EQUAL (frc.skip, false);
@@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
        film->examine_and_add_content (A);
        shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (B);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        /* Run some tests with a limited range of allowed rates */
 
@@ -255,7 +255,7 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
        /* Get any piece of content, it doesn't matter what */
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        std::list<int> afr;
        afr.push_back (24);
@@ -275,7 +275,7 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
        BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000);
 
        stream->_frame_rate = 80000;
-       BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 96000);
+       BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000);
 
        content->_video_frame_rate = 23.976;
        film->set_video_frame_rate (24);