summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-03 15:31:21 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-03 15:31:21 +0100
commitf98caf4af896e9be943046b84586da5c2e103f18 (patch)
tree993f719e293667c432c95026dc2bfd53d5b84982 /test
parent92c377d1b9e781fbb4b1f1b7a76ca7dba0bd637f (diff)
Make show audio work on the whole DCP, not individual content.
Diffstat (limited to 'test')
-rw-r--r--test/audio_analysis_test.cc10
1 files changed, 8 insertions, 2 deletions
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 <boost/test/unit_test.hpp>
#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<AnalyseAudioJob> 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<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+ job->Finished.connect (boost::bind (&finished));
+ JobManager::instance()->add (job);
wait_for_jobs ();
}