X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=a7e44bdfbd34f3360f5460bcc612b8562de70004;hb=1f8b45c7fd49714628009f5ed2161fbaa2b4d729;hp=4bd76c07ff8ac2cc77f3cfa6c1adddf74329f902;hpb=bd453939da140ea994282e1c167ea5f8d02e2d94;p=dcpomatic.git

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 4bd76c07f..a7e44bdfb 100644
--- a/test/black_fill_test.cc
+++ b/test/black_fill_test.cc
@@ -18,7 +18,7 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include "lib/still_image_content.h"
+#include "lib/image_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
@@ -37,19 +37,19 @@ 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<StillImageContent> contentA (new StillImageContent (film, "test/data/simple_testcard_640x480.png"));
-	contentA->set_ratio (Ratio::from_id ("185"));
-	shared_ptr<StillImageContent> contentB (new StillImageContent (film, "test/data/simple_testcard_640x480.png"));
-	contentB->set_ratio (Ratio::from_id ("185"));
+	shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
+	contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	shared_ptr<ImageContent> 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 (3);
-	contentA->set_start (film->video_frames_to_time (2));
-	contentB->set_video_length (1);
-	contentB->set_start (film->video_frames_to_time (7));
+	contentA->set_video_length (ContentTime::from_frames (3, 24));
+	contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+	contentB->set_video_length (ContentTime::from_frames (1, 24));
+	contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
 
 	film->make_dcp ();