std::shared_ptr

[dcpomatic.git] / test / upmixer_a_test.cc

diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index c89d3f29a90c56c6744e0cf4bb59dc0f95e3ada0..35224ff234a6c2f0bceceeed708834d5bdaac4c6 100644 (file)
--- 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;
@@ -65,7 +69,7 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
        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()) {}