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

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 99e0870b1..173c256e2 100644
--- a/test/black_fill_test.cc
+++ b/test/black_fill_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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
@@ -22,6 +22,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
 #include "test.h"
 
 /** @file test/black_fill_test.cc
@@ -36,19 +37,19 @@ BOOST_AUTO_TEST_CASE (black_fill_test)
 	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"));
 	shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 
-	film->examine_and_add_content (contentA, true);
-	film->examine_and_add_content (contentB, true);
+	film->examine_and_add_content (contentA);
+	film->examine_and_add_content (contentB);
 	wait_for_jobs ();
 
-	contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
-	contentA->set_video_length (ContentTime::from_frames (3, 24));
+	contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	contentA->video->set_video_length (3);
 	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->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	contentB->video->set_video_length (1);
 	contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
 
 	film->make_dcp ();
@@ -68,4 +69,3 @@ BOOST_AUTO_TEST_CASE (black_fill_test)
 
 	check_dcp (ref.string(), check.string());
 }
-