X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=e6f4b69eea64b857cd0477e4ab95ae88832cf730;hp=148ec9738c74329c9c126506488fac020ff41037;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=7979aeb87a83de31c4cf25f88eef4fbca4b56553 diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc index 148ec9738..e6f4b69ee 100644 --- a/test/black_fill_test.cc +++ b/test/black_fill_test.cc @@ -38,17 +38,17 @@ BOOST_AUTO_TEST_CASE (black_fill_test) film->set_container (Ratio::from_id ("185")); film->set_sequence_video (false); shared_ptr contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - contentA->set_scale (VideoContentScale (Ratio::from_id ("185"))); shared_ptr contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - contentB->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->examine_and_add_content (contentA); film->examine_and_add_content (contentB); wait_for_jobs (); - contentA->set_video_length (ContentTime::from_frames (3, 24)); + contentA->set_scale (VideoContentScale (Ratio::from_id ("185"))); + contentA->set_video_length (3); contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ())); - contentB->set_video_length (ContentTime::from_frames (1, 24)); + contentB->set_scale (VideoContentScale (Ratio::from_id ("185"))); + contentB->set_video_length (1); contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ())); film->make_dcp ();