X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=6da0b037a1164a35923c0c14ee849e0cd6f7232c;hb=e93b696a5ee3d39c723a79bb22fe6768916936eb;hp=ef768b9a49daa2d7fd1ff1debfe671335504ca18;hpb=b1ad58ce47cecdec6ad4bf8233bc073991cc3cbb;p=dcpomatic.git

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index ef768b9a4..6da0b037a 100644
--- a/test/black_fill_test.cc
+++ b/test/black_fill_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,22 +33,22 @@ 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);
+	film->set_sequence (false);
 	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 (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 ();
@@ -68,4 +68,3 @@ BOOST_AUTO_TEST_CASE (black_fill_test)
 
 	check_dcp (ref.string(), check.string());
 }
-