X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fupmixer_a_test.cc;h=35224ff234a6c2f0bceceeed708834d5bdaac4c6;hb=82d9063f46be8faa529361b5bf58a4fabad39fca;hp=2dccedacbcee5ba07425e721dbb2b3a31c7822b4;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git

diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 2dccedacb..35224ff23 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/upmixer_a_test.cc
  *  @brief Check the Upmixer A against some reference sound files.
- *  @ingroup specific
+ *  @ingroup selfcontained
  */
 
 #include <boost/test/unit_test.hpp>
@@ -34,7 +34,11 @@
 #include "lib/upmixer_a.h"
 #include "test.h"
 
-using boost::shared_ptr;
+using std::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()) {}
 
@@ -89,10 +93,10 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
 	sf_close (Ls);
 	sf_close (Rs);
 
-	check_audio_file ("test/data/upmixer_a_test/L.wav", "build/test/upmixer_a_test/L.wav");
-	check_audio_file ("test/data/upmixer_a_test/R.wav", "build/test/upmixer_a_test/R.wav");
-	check_audio_file ("test/data/upmixer_a_test/C.wav", "build/test/upmixer_a_test/C.wav");
-	check_audio_file ("test/data/upmixer_a_test/Lfe.wav", "build/test/upmixer_a_test/Lfe.wav");
-	check_audio_file ("test/data/upmixer_a_test/Ls.wav", "build/test/upmixer_a_test/Ls.wav");
-	check_audio_file ("test/data/upmixer_a_test/Rs.wav", "build/test/upmixer_a_test/Rs.wav");
+	check_wav_file ("test/data/upmixer_a_test/L.wav", "build/test/upmixer_a_test/L.wav");
+	check_wav_file ("test/data/upmixer_a_test/R.wav", "build/test/upmixer_a_test/R.wav");
+	check_wav_file ("test/data/upmixer_a_test/C.wav", "build/test/upmixer_a_test/C.wav");
+	check_wav_file ("test/data/upmixer_a_test/Lfe.wav", "build/test/upmixer_a_test/Lfe.wav");
+	check_wav_file ("test/data/upmixer_a_test/Ls.wav", "build/test/upmixer_a_test/Ls.wav");
+	check_wav_file ("test/data/upmixer_a_test/Rs.wav", "build/test/upmixer_a_test/Rs.wav");
 }