X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_processor_test.cc;h=52dacb646bb65b4cfb4f777224c6ba5d8e9914fe;hp=a668a7e0953d6059f1c8b76c7a6a9fc0fd804272;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=b9842263a402b5ce1d2f85a1346ca11a419f816e

diff --git a/test/audio_processor_test.cc b/test/audio_processor_test.cc
index a668a7e09..52dacb646 100644
--- a/test/audio_processor_test.cc
+++ b/test/audio_processor_test.cc
@@ -1,53 +1,63 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
+/** @file  test/audio_processor_test.cc
+ *  @brief Test audio processors.
+ *  @ingroup feature
+ */
+
+
 #include "lib/audio_processor.h"
 #include "lib/analyse_audio_job.h"
 #include "lib/dcp_content_type.h"
 #include "lib/job_manager.h"
-#include "lib/sndfile_content.h"
+#include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+
+using std::shared_ptr;
+using std::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");
+	auto film = new_test_film ("audio_processor_test");
 	film->set_name ("audio_processor_test");
-	shared_ptr<SndfileContent> c (new SndfileContent (film, "test/data/white.wav"));
+	auto c = make_shared<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 (new AnalyseAudioJob (film, film->playlist ()));
+	auto job = make_shared<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 ();
+	make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA});
 	check_dcp ("test/data/audio_processor_test", film->dir (film->dcp_name ()));
 }