X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=9e8aa381bbd0cb0832006fe2a7d6108b71699bac;hb=7f2cb335b6d48a23f48761104934e9b06d4ac464;hp=48cf1f53c3d62a8b3c55e6914ecc24ce74e929ca;hpb=59404039618db5d70a2f8fc0cb8c49ae4f8ce527;p=dcpomatic.git diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc index 48cf1f53c..9e8aa381b 100644 --- a/test/black_fill_test.cc +++ b/test/black_fill_test.cc @@ -18,7 +18,7 @@ */ #include -#include "lib/imagemagick_content.h" +#include "lib/image_content.h" #include "lib/dcp_content_type.h" #include "lib/film.h" #include "lib/ratio.h" @@ -37,9 +37,9 @@ BOOST_AUTO_TEST_CASE (black_fill_test) film->set_name ("black_fill_test"); film->set_container (Ratio::from_id ("185")); film->set_sequence_video (false); - shared_ptr contentA (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); contentA->set_ratio (Ratio::from_id ("185")); - shared_ptr contentB (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png")); contentB->set_ratio (Ratio::from_id ("185")); film->examine_and_add_content (contentA); @@ -47,9 +47,9 @@ BOOST_AUTO_TEST_CASE (black_fill_test) wait_for_jobs (); contentA->set_video_length (3); - contentA->set_start (film->video_frames_to_time (2)); + contentA->set_position (film->video_frames_to_time (2)); contentB->set_video_length (1); - contentB->set_start (film->video_frames_to_time (7)); + contentB->set_position (film->video_frames_to_time (7)); film->make_dcp ();