X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=99e0870b17c59801d64810fbacf00889e007d1f7;hb=c008066160d85b9ec9e5485375d7baaa5d27bda2;hp=7741277a595e753cacd76ffdff1b5a2f67b3cf0f;hpb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;p=dcpomatic.git diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc index 7741277a5..99e0870b1 100644 --- a/test/black_fill_test.cc +++ b/test/black_fill_test.cc @@ -33,21 +33,21 @@ using boost::shared_ptr; BOOST_AUTO_TEST_CASE (black_fill_test) { shared_ptr film = new_test_film ("black_fill_test"); - film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_name ("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); + film->examine_and_add_content (contentA, true); + film->examine_and_add_content (contentB, true); wait_for_jobs (); + contentA->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentA->set_video_length (ContentTime::from_frames (3, 24)); contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ())); + contentB->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentB->set_video_length (ContentTime::from_frames (1, 24)); contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));