X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=e6f4b69eea64b857cd0477e4ab95ae88832cf730;hp=1e3bf1d545b534b35d61ee5c47e6fdceccdd9f51;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=764dfcd5aea143d1246873667e646f86d99e33a4

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 1e3bf1d54..e6f4b69ee 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
@@ -17,10 +17,15 @@
 
 */
 
-#include "imagemagick_content.h"
+#include <boost/test/unit_test.hpp>
+#include "lib/image_content.h"
+#include "lib/dcp_content_type.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
+#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;
@@ -28,29 +33,27 @@ 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<ImageMagickContent> contentA (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png"));
-	contentA->set_ratio (Ratio::from_id ("185"));
-	shared_ptr<ImageMagickContent> contentB (new ImageMagickContent (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"));
+	shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 
 	film->examine_and_add_content (contentA);
 	film->examine_and_add_content (contentB);
-	while (JobManager::instance()->work_to_do ()) {}
+	wait_for_jobs ();
 
+	contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentA->set_video_length (3);
-	contentA->set_start (film->video_frames_to_time (2));
+	contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+	contentB->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentB->set_video_length (1);
-	contentB->set_start (film->video_frames_to_time (7));
+	contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
 
 	film->make_dcp ();
 
-	while (JobManager::instance()->work_to_do ()) {}
-
-	BOOST_CHECK (!JobManager::instance()->errors());
+	wait_for_jobs ();
 
 	boost::filesystem::path ref;
 	ref = "test";