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

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 7ea031e27..79b97ad77 100644
--- a/test/black_fill_test.cc
+++ b/test/black_fill_test.cc
@@ -1,26 +1,33 @@
 /*
-    Copyright (C) 2013 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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#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 "lib/video_content.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 +35,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"));
+	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);
 	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->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	contentA->video->set_length (3);
+	contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+	contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	contentB->video->set_length (1);
+	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";
@@ -65,4 +70,3 @@ BOOST_AUTO_TEST_CASE (black_fill_test)
 
 	check_dcp (ref.string(), check.string());
 }
-