X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fupmixer_a_test.cc;h=2d1e652229cf2413adda872b9fc4d50693e2ae82;hb=497803ab4424ce23affd231a01d625ddf3cf3aca;hp=651ac7f38da9e2d5dc7ae959a3880643cc18c014;hpb=eea4471bb8c681b9130d4c5049f386b240a3ac3a;p=dcpomatic.git

diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 651ac7f38..2d1e65222 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -35,6 +35,10 @@
 #include "test.h"
 
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
 
 static SNDFILE* L;
 static SNDFILE* R;
@@ -62,10 +66,10 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_audio_processor (AudioProcessor::from_id ("stereo-5.1-upmix-a"));
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/white.wav"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/white.wav"));
 	film->examine_and_add_content (content);
 
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	SF_INFO info;
 	info.samplerate = 48000;
@@ -78,7 +82,7 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
 	Ls = sf_open ("build/test/upmixer_a_test/Ls.wav", SFM_WRITE, &info);
 	Rs = sf_open ("build/test/upmixer_a_test/Rs.wav", SFM_WRITE, &info);
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film));
 	player->Audio.connect (bind (&write, _1, _2));
 	while (!player->pass()) {}