X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=0f639587bd45232f0e94dcca322ec8ec08b39f36;hp=4307fb413541fe424ea4ec19640da5065088e533;hb=e81c5eb9e8ff875240dde9fdaaab0a46f99af615;hpb=a5c1639bb3c8b880d2742eadf4c2fb3094ad60be

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 4307fb413..0f639587b 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -28,25 +28,34 @@
 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(TestPaths::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 ();
-
-	shared_ptr<Butler> butler (new Butler(shared_ptr<Player>(new Player(film, film->playlist())), shared_ptr<Log>(), AudioMapping(6, 6), 6));
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	shared_ptr<Butler> butler (
+		new Butler(
+			shared_ptr<Player>(new Player(film)),
+			AudioMapping(6, 6),
+			6,
+			bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+			false,
+			true)
+		);
 	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;
 		}
 		/* assuming DCP is 24fps/48kHz */
 		butler->get_audio (audio_buffer, 2000);
-		p.first->image(optional<dcp::NoteHandler>(), bind(&PlayerVideo::always_rgb, _1), false, true);
+		p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true);
 	}
 	delete[] audio_buffer;
 }