X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=1dda667a08ab825bac698cb9e2fe6ca83a7bbf53;hb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;hp=3e3ffe089cfa630251a347a95010078c39815c5d;hpb=f41310384889e4cfb6e709d098b316e212d8bf22;p=dcpomatic.git

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 3e3ffe089..1dda667a0 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -28,19 +28,19 @@
 using std::pair;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 /** Simulate the work that the player does, for profiling */
 BOOST_AUTO_TEST_CASE (dcp_playback_test)
 {
 	shared_ptr<Film> film = new_test_film ("dcp_playback_test");
-	shared_ptr<DCPContent> content (new DCPContent(film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+	shared_ptr<DCPContent> content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	shared_ptr<Butler> butler (
 		new Butler(
 			shared_ptr<Player>(new Player(film, film->playlist())),
-			shared_ptr<Log>(),
 			AudioMapping(6, 6),
 			6,
 			bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
 		);
 	float* audio_buffer = new float[2000*6];
 	while (true) {
-		pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video ();
+		pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video (true, 0);
 		if (!p.first) {
 			break;
 		}