X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=5c594f68cc064f170d3290c83833422522012c52;hb=734340b52d30cb2dde9aa9e81c77277b261b128e;hp=2c239e767fcf99bc4856224e5cedb42895b1b332;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 2c239e767..5c594f68c 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"
@@ -33,14 +33,14 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (black_fill_test)
 {
 	shared_ptr<Film> 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<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);