X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=733883b5a5fba4b6e0b58e7127f00822bb542763;hb=refs%2Ftags%2Fv2.16.37;hp=d0460d88da1d6a455c410a6ec0a46e79dce3585d;hpb=5334f1c120ed248f22a5751d47555cf94bf9b4a9;p=dcpomatic.git diff --git a/test/player_test.cc b/test/player_test.cc index d0460d88d..733883b5a 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -301,7 +301,7 @@ BOOST_AUTO_TEST_CASE (player_trim_test) BOOST_REQUIRE (!wait_for_jobs ()); B->video->set_length (10 * 24); B->set_position (film, DCPTime::from_seconds(10)); - B->set_trim_start (ContentTime::from_seconds (2)); + B->set_trim_start(film, ContentTime::from_seconds(2)); make_and_verify_dcp (film); } @@ -368,7 +368,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash) /* Wait for the butler to fill */ dcpomatic_sleep_seconds (5); - boon->set_trim_start (ContentTime::from_seconds(5)); + boon->set_trim_start(film, ContentTime::from_seconds(5)); butler->seek (DCPTime(), true); @@ -387,7 +387,7 @@ BOOST_AUTO_TEST_CASE (player_silence_crash) film->examine_and_add_content (sine); BOOST_REQUIRE (!wait_for_jobs()); - sine->set_video_frame_rate (23.976); + sine->set_video_frame_rate(film, 23.976); film->write_metadata (); make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA}); } @@ -569,7 +569,7 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13) A->audio->set_gain(-12); B->set_position(film, DCPTime()); B->audio->set_gain(-12); - B->set_trim_start(ContentTime(13)); + B->set_trim_start(film, ContentTime(13)); make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA }); check_mxf_audio_file("test/data/trimmed_sound_mix_bug_13.mxf", dcp_file(film, "pcm_")); @@ -586,10 +586,10 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13_frame_rate_change) A->audio->set_gain(-12); B->set_position(film, DCPTime()); B->audio->set_gain(-12); - B->set_trim_start(ContentTime(13)); + B->set_trim_start(film, ContentTime(13)); - A->set_video_frame_rate(24); - B->set_video_frame_rate(24); + A->set_video_frame_rate(film, 24); + B->set_video_frame_rate(film, 24); film->set_video_frame_rate(25); make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });