X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=99e0870b17c59801d64810fbacf00889e007d1f7;hp=a7e44bdfbd34f3360f5460bcc612b8562de70004;hb=bee98cdc1ddc5f87749de3bbf2ae5e4b2ef498c3;hpb=09806bc8d6a48fc79d923ec1cdf6f90176bf8b6a

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index a7e44bdfb..99e0870b1 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
@@ -25,7 +25,7 @@
 #include "test.h"
 
 /** @file test/black_fill_test.cc
- *  @brief Test insertion of black frames between video content.
+ *  @brief Test insertion of black frames between separate bits of video content.
  */
 
 using boost::shared_ptr;
@@ -33,21 +33,21 @@ 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<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);
+	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 ()));