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

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 5c594f68c..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;
@@ -38,18 +38,18 @@ BOOST_AUTO_TEST_CASE (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_video_length (3);
-	contentA->set_position (film->video_frames_to_time (2));
-	contentB->set_video_length (1);
-	contentB->set_position (film->video_frames_to_time (7));
+	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 ()));
 
 	film->make_dcp ();