X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=a5b69e1819051da1ab404ff7bf3a1e61af737adf;hb=HEAD;hp=28368dc34214a34c4aa3b16c958f5f0fa0ebdde0;hpb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;p=dcpomatic.git

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 28368dc34..a5b69e181 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -43,27 +43,29 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
+	Player player(film, Image::Alignment::PADDED);
+
 	auto butler = std::make_shared<Butler>(
 		film,
-		make_shared<Player>(film, Image::Alignment::COMPACT),
+		player,
 		AudioMapping(6, 6),
 		6,
-		bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+		boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
 		VideoRange::FULL,
-		Image::Alignment::COMPACT,
+		Image::Alignment::PADDED,
 		true,
-		false
+		false,
+		Butler::Audio::ENABLED
 		);
 
-	auto audio_buffer = new float[2000 * 6];
+	std::vector<float> audio_buffer(2000 * 6);
 	while (true) {
-		auto p = butler->get_video (true, 0);
+		auto p = butler->get_video (Butler::Behaviour::BLOCKING, 0);
 		if (!p.first) {
 			break;
 		}
 		/* assuming DCP is 24fps/48kHz */
-		butler->get_audio (audio_buffer, 2000);
-		p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true);
+		butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer.data(), 2000);
+		p.first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
 	}
-	delete[] audio_buffer;
 }