X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fempty_test.cc;h=428d0f9bb3e75d4c1bb9ac99f92a225068682ade;hb=95f4d8740de74cdecf6658ab2607c0af9732904e;hp=71397273942bbbe8312ec90bc1b4a42ffd0a8ff8;hpb=7a3f4f1b6411f7d15bf00e863fb5e70a5d930dd8;p=dcpomatic.git

diff --git a/test/empty_test.cc b/test/empty_test.cc
index 713972739..428d0f9bb 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -24,10 +24,19 @@
 #include "lib/video_content.h"
 #include "lib/image_content.h"
 #include "lib/empty.h"
+#include "lib/player.h"
+#include "lib/decoder.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
+using namespace dcpomatic;
+
+bool
+has_video (shared_ptr<Piece> piece)
+{
+        return piece->decoder && piece->decoder->video;
+}
 
 BOOST_AUTO_TEST_CASE (empty_test1)
 {
@@ -36,23 +45,24 @@ 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));
 
-	Empty black (film->content(), film->length(), bind(&Content::video, _1));
+	shared_ptr<Player> player (new Player(film, film->playlist()));
+	Empty black (film, player->_pieces, 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));
@@ -68,23 +78,24 @@ 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));
 
-	Empty black (film->content(), film->length(), bind(&Content::video, _1));
+	shared_ptr<Player> player (new Player(film, film->playlist()));
+	Empty black (film, player->_pieces, bind(&has_video, _1));
 	BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
 	BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr));
 	BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));