X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_processor_test.cc;h=4e917bd45bbad300c84e8bfcec3ee2bf0ec4b18f;hb=48b82de5b6e8e07330a2f72dbddd8d9830fe047e;hp=97d2cd759d3b4e77611dddf67bfa715530c47685;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/audio_processor_test.cc b/test/audio_processor_test.cc
index 97d2cd759..4e917bd45 100644
--- a/test/audio_processor_test.cc
+++ b/test/audio_processor_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/audio_processor_test.cc
+ *  @brief Test audio processors.
+ *  @ingroup specific
+ */
+
 #include "lib/audio_processor.h"
 #include "lib/analyse_audio_job.h"
 #include "lib/dcp_content_type.h"
@@ -26,31 +31,29 @@
 #include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
 using boost::shared_ptr;
-using boost::make_shared;
 
 /** Test the mid-side decoder for analysis and DCP-making */
 BOOST_AUTO_TEST_CASE (audio_processor_test)
 {
 	shared_ptr<Film> film = new_test_film ("audio_processor_test");
 	film->set_name ("audio_processor_test");
-	shared_ptr<FFmpegContent> c = make_shared<FFmpegContent> (film, "test/data/white.wav");
+	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/white.wav"));
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_audio_channels (6);
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->set_audio_processor (AudioProcessor::from_id ("mid-side-decoder"));
 
 	/* Analyse the audio and check it doesn't crash */
-	shared_ptr<AnalyseAudioJob> job = make_shared<AnalyseAudioJob> (film, film->playlist ());
+	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
 	JobManager::instance()->add (job);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Make a DCP and check it */
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	check_dcp ("test/data/audio_processor_test", film->dir (film->dcp_name ()));
 }