X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=62c72cc84e85fd25e86ee605643e27fe4811a78c;hb=8987f133295e352c44e05ef338eacc801c61a629;hp=ef1b623e78ffc8f7a67ef1f46dbd9ae37628ecb9;hpb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;p=dcpomatic.git

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index ef1b623e7..62c72cc84 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -28,9 +28,7 @@
 
 
 using std::make_shared;
-using std::pair;
-using std::shared_ptr;
-using boost::optional;
+using std::make_shared;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -47,24 +45,25 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
 
 	auto butler = std::make_shared<Butler>(
 		film,
-		shared_ptr<Player>(new Player(film)),
+		make_shared<Player>(film, Image::Alignment::PADDED),
 		AudioMapping(6, 6),
 		6,
-		bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+		boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
 		VideoRange::FULL,
+		Image::Alignment::PADDED,
+		true,
 		false,
-		true
+		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, false, 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;
 }