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

diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 651ac7f38..af6c8b9e2 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,23 +18,32 @@
 
 */
 
+
 /** @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>
-#include <sndfile.h>
-#include "lib/film.h"
-#include "lib/ratio.h"
+
+#include "lib/audio_buffers.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/player.h"
-#include "lib/audio_buffers.h"
+#include "lib/ratio.h"
 #include "lib/upmixer_a.h"
 #include "test.h"
+#include <sndfile.h>
+#include <boost/test/unit_test.hpp>
+
+
+using std::make_shared;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
 
-using boost::shared_ptr;
 
 static SNDFILE* L;
 static SNDFILE* R;
@@ -43,6 +52,7 @@ static SNDFILE* Lfe;
 static SNDFILE* Ls;
 static SNDFILE* Rs;
 
+
 static void
 write (shared_ptr<AudioBuffers> b, DCPTime)
 {
@@ -55,17 +65,18 @@ write (shared_ptr<AudioBuffers> b, DCPTime)
 
 }
 
+
 BOOST_AUTO_TEST_CASE (upmixer_a_test)
 {
-	shared_ptr<Film> film = new_test_film ("upmixer_a_test");
-	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+	auto film = new_test_film ("upmixer_a_test");
+	film->set_container (Ratio::from_id("185"));
+	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"));
+	film->set_audio_processor (AudioProcessor::from_id("stereo-5.1-upmix-a"));
+	auto content = make_shared<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 +89,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 ()));
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
 	player->Audio.connect (bind (&write, _1, _2));
 	while (!player->pass()) {}