X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fblack_fill_test.cc;h=7741277a595e753cacd76ffdff1b5a2f67b3cf0f;hb=233bb3f790aef3c8f9a7a7fde9875833b7dc1dfb;hp=7ea031e27c089bc3a03a8de71a34de0882075194;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 7ea031e27..7741277a5 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;
@@ -32,25 +37,23 @@ BOOST_AUTO_TEST_CASE (black_fill_test)
 	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"));
+	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);
-	while (JobManager::instance()->work_to_do ());
+	wait_for_jobs ();
 
-	contentA->set_video_length (3);
-	contentA->set_start (film->video_frames_to_time (2));
-	contentB->set_video_length (1);
-	contentB->set_start (film->video_frames_to_time (7));
+	contentA->set_video_length (ContentTime::from_frames (3, 24));
+	contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+	contentB->set_video_length (ContentTime::from_frames (1, 24));
+	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";