X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fempty_test.cc;h=f0fa7138f46408a456e7db54df24fdbfdb29c1c8;hp=576577b97e1cba5701575a9267f926e42ac8e526;hb=6cb5e8213a0714d47efe87ee8e96794d91f8ac6d;hpb=1938b1b08d38fc199717d1875a61ef05e5b965de

diff --git a/test/empty_test.cc b/test/empty_test.cc
index 576577b97..f0fa7138f 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,7 +29,9 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
+using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 bool
 has_video (shared_ptr<Piece> piece)
@@ -44,29 +46,34 @@ BOOST_AUTO_TEST_CASE (empty_test1)
 	film->set_name ("empty_test1");
 	film->set_container (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"));
+	shared_ptr<ImageContent> contentA (new ImageContent("test/data/simple_testcard_640x480.png"));
+	shared_ptr<ImageContent> contentB (new ImageContent("test/data/simple_testcard_640x480.png"));
 
 	film->examine_and_add_content (contentA);
 	film->examine_and_add_content (contentB);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	int const vfr = film->video_frame_rate ();
 
 	contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentA->video->set_length (3);
-	contentA->set_position (DCPTime::from_frames (2, vfr));
+	contentA->set_position (film, DCPTime::from_frames (2, vfr));
 	contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentB->video->set_length (1);
-	contentB->set_position (DCPTime::from_frames (7, vfr));
+	contentB->set_position (film, DCPTime::from_frames (7, vfr));
 
 	shared_ptr<Player> player (new Player(film, film->playlist()));
-	Empty black (player->_pieces, film->length(), bind(&has_video, _1));
-	BOOST_REQUIRE_EQUAL (black._periods.size(), 2);
-	BOOST_CHECK (black._periods.front().from == DCPTime());
-	BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(2, vfr));
-	BOOST_CHECK (black._periods.back().from == DCPTime::from_frames(5, vfr));
-	BOOST_CHECK (black._periods.back().to == DCPTime::from_frames(7, vfr));
+	Empty black (film, player->_pieces, bind(&has_video, _1));
+	BOOST_REQUIRE_EQUAL (black._periods.size(), 3);
+	list<dcpomatic::DCPTimePeriod>::const_iterator i = black._periods.begin();
+	BOOST_CHECK (i->from == DCPTime());
+	BOOST_CHECK (i->to == DCPTime::from_frames(2, vfr));
+	++i;
+	BOOST_CHECK (i->from == DCPTime::from_frames(5, vfr));
+	BOOST_CHECK (i->to == DCPTime::from_frames(7, vfr));
+	++i;
+	BOOST_CHECK (i->from == DCPTime::from_frames(8, vfr));
+	BOOST_CHECK (i->to == DCPTime::from_frames(24, vfr));
 }
 
 /** Some tests where the first empty period is not at time 0 */
@@ -77,25 +84,25 @@ BOOST_AUTO_TEST_CASE (empty_test2)
 	film->set_name ("empty_test1");
 	film->set_container (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"));
+	shared_ptr<ImageContent> contentA (new ImageContent("test/data/simple_testcard_640x480.png"));
+	shared_ptr<ImageContent> contentB (new ImageContent("test/data/simple_testcard_640x480.png"));
 
 	film->examine_and_add_content (contentA);
 	film->examine_and_add_content (contentB);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	int const vfr = film->video_frame_rate ();
 
 	contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentA->video->set_length (3);
-	contentA->set_position (DCPTime(0));
+	contentA->set_position (film, DCPTime(0));
 	contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentB->video->set_length (1);
-	contentB->set_position (DCPTime::from_frames (7, vfr));
+	contentB->set_position (film, DCPTime::from_frames(7, vfr));
 
 	shared_ptr<Player> player (new Player(film, film->playlist()));
-	Empty black (player->_pieces, film->length(), bind(&has_video, _1));
-	BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
+	Empty black (film, player->_pieces, bind(&has_video, _1));
+	BOOST_REQUIRE_EQUAL (black._periods.size(), 2);
 	BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr));
 	BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
 
@@ -107,5 +114,7 @@ BOOST_AUTO_TEST_CASE (empty_test2)
 	black.set_position (DCPTime::from_frames (4, vfr));
 	BOOST_CHECK (!black.done ());
 	black.set_position (DCPTime::from_frames (7, vfr));
+	BOOST_CHECK (!black.done ());
+	black.set_position (DCPTime::from_frames (24, vfr));
 	BOOST_CHECK (black.done ());
 }