X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fframe_rate_test.cc;h=76a8ed5cbefe56c0872161126de9a81a926ef6ac;hb=922dc3605c29bd742a18b02fbe1faae5739b70df;hp=0a31294581eea490bb6608c529a8d23edbd57b1f;hpb=6cc7359c1af897f334dab5ba455707ce0c59af9d;p=dcpomatic.git diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc index 0a3129458..76a8ed5cb 100644 --- a/test/frame_rate_test.cc +++ b/test/frame_rate_test.cc @@ -21,7 +21,7 @@ /** @file test/frame_rate_test.cc * @brief Tests for FrameRateChange and the computation of the best * frame rate for the DCP. - * @ingroup specific + * @ingroup feature */ #include @@ -35,7 +35,7 @@ #include "lib/audio_content.h" #include "test.h" -using boost::shared_ptr; +using std::shared_ptr; /* Test Playlist::best_dcp_frame_rate and FrameRateChange with a single piece of content. @@ -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);