X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcontent_test.cc;fp=test%2Fcontent_test.cc;h=12e653875a43d7e3587d81d5a46d7a4076e641b7;hb=5799460dc38bafa1da1ce9f7bf43621d3fadf442;hp=9e33225f0a30fbdafc396b8594f265694ca6e68b;hpb=aaf6845e130ac208cee524536b67c54bd1ce8ed9;p=dcpomatic.git diff --git a/test/content_test.cc b/test/content_test.cc index 9e33225f0..12e653875 100644 --- a/test/content_test.cc +++ b/test/content_test.cc @@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (content_test2) { auto content = content_factory("test/data/red_23976.mp4")[0]; auto film = new_test_film2 ("content_test2", {content}); - content->set_trim_start(ContentTime::from_seconds(0.5)); + content->set_trim_start(film, ContentTime::from_seconds(0.5)); make_and_verify_dcp (film); } @@ -81,15 +81,15 @@ BOOST_AUTO_TEST_CASE (content_test3) /* Trim */ /* 12 frames */ - content->set_trim_start (ContentTime::from_seconds (12.0 / 24.0)); + content->set_trim_start(film, ContentTime::from_seconds (12.0 / 24.0)); BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (12.0 / 24.0)); /* 11.2 frames */ - content->set_trim_start (ContentTime::from_seconds (11.2 / 24.0)); + content->set_trim_start(film, ContentTime::from_seconds (11.2 / 24.0)); BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (11.0 / 24.0)); /* 13.9 frames */ - content->set_trim_start (ContentTime::from_seconds (13.9 / 24.0)); + content->set_trim_start(film, ContentTime::from_seconds (13.9 / 24.0)); BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (14.0 / 24.0)); /* Position */ @@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE (content_test3) content->set_position (film, DCPTime::from_seconds(13.9 / 24.0)); BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0)); - content->set_video_frame_rate (25); + content->set_video_frame_rate(film, 25); /* Check that trim is fixed when the content's video frame rate is `forced' */