From a8a0dfd1b21de6c0facf965ab119833ff6f790bf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 21 Jun 2016 23:08:53 +0100 Subject: Revert "Use make_shared<>." Support for this seems to vary wildly across DoM's build targets. Stuff that builds on 16.04 won't build on 14.04, for example. Seems to not be worth the hassle now. This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f. --- test/audio_processor_test.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'test/audio_processor_test.cc') diff --git a/test/audio_processor_test.cc b/test/audio_processor_test.cc index 97d2cd759..8357cff78 100644 --- a/test/audio_processor_test.cc +++ b/test/audio_processor_test.cc @@ -26,17 +26,15 @@ #include "lib/film.h" #include "test.h" #include -#include 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 = new_test_film ("audio_processor_test"); film->set_name ("audio_processor_test"); - shared_ptr c = make_shared (film, "test/data/white.wav"); + shared_ptr c (new FFmpegContent (film, "test/data/white.wav")); film->examine_and_add_content (c); wait_for_jobs (); @@ -45,7 +43,7 @@ BOOST_AUTO_TEST_CASE (audio_processor_test) film->set_audio_processor (AudioProcessor::from_id ("mid-side-decoder")); /* Analyse the audio and check it doesn't crash */ - shared_ptr job = make_shared (film, film->playlist ()); + shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); JobManager::instance()->add (job); wait_for_jobs (); -- cgit v1.2.3