From f98caf4af896e9be943046b84586da5c2e103f18 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 3 Jun 2015 15:31:21 +0100 Subject: Make show audio work on the whole DCP, not individual content. --- test/audio_analysis_test.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index 7be9ca549..fb70f3e7d 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -23,11 +23,13 @@ #include #include "lib/audio_analysis.h" +#include "lib/analyse_audio_job.h" #include "lib/film.h" #include "lib/sndfile_content.h" #include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" #include "lib/ratio.h" +#include "lib/job_manager.h" #include "test.h" using boost::shared_ptr; @@ -97,7 +99,9 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test) film->examine_and_add_content (c); wait_for_jobs (); - c->analyse_audio (boost::bind (&finished)); + shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); + job->Finished.connect (boost::bind (&finished)); + JobManager::instance()->add (job); wait_for_jobs (); } @@ -111,6 +115,8 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test) film->examine_and_add_content (c); wait_for_jobs (); - c->analyse_audio (boost::bind (&finished)); + shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); + job->Finished.connect (boost::bind (&finished)); + JobManager::instance()->add (job); wait_for_jobs (); } -- cgit v1.2.3