Cleanup: use a lambda.

[dcpomatic.git] / test / audio_analysis_test.cc

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index b3c519f2934963a8001da3c258cbbcf1d58633a5..39abe7e48197325048f9afd3a6211594f3eaf0e2 100644 (file)
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -43,7 +43,6 @@
 
 
 using std::make_shared;
-using std::shared_ptr;
 using std::vector;
 using namespace dcpomatic;
 
@@ -149,15 +148,6 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2)
 }
 
 
-static bool done = false;
-
-static void
-analysis_finished ()
-{
-       done = true;
-}
-
-
 /* Test a case which was reported to throw an exception; analysing
  * a 12-channel DCP's audio.
  */
@@ -174,7 +164,8 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 
        film->set_audio_channels (12);
        boost::signals2::connection connection;
-       JobManager::instance()->analyse_audio(film, film->playlist(), false, connection, boost::bind(&analysis_finished));
+       bool done = false;
+       JobManager::instance()->analyse_audio(film, film->playlist(), false, connection, [&done](Job::Result) { done = true; });
        BOOST_REQUIRE (!wait_for_jobs());
        BOOST_CHECK (done);
 }
@@ -194,7 +185,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4)
        auto playlist = make_shared<Playlist>();
        playlist->add (film, content);
        boost::signals2::connection c;
-       JobManager::instance()->analyse_audio(film, playlist, false, c, []() {});
+       JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {});
        BOOST_CHECK (!wait_for_jobs ());
 }
 
@@ -210,7 +201,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test)
        auto playlist = make_shared<Playlist>();
        playlist->add (film, content);
        boost::signals2::connection c;
-       JobManager::instance()->analyse_audio(film, playlist, false, c, []() {});
+       JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {});
        BOOST_CHECK (!wait_for_jobs());
 
        AudioAnalysis analysis(film->audio_analysis_path(playlist));
@@ -231,6 +222,20 @@ BOOST_AUTO_TEST_CASE(analyse_audio_with_long_silent_end)
        auto playlist = make_shared<Playlist>();
        playlist->add(film, content);
        boost::signals2::connection c;
-       JobManager::instance()->analyse_audio(film, playlist, false, c, []() {});
+       JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {});
        BOOST_CHECK(!wait_for_jobs());
 }
+
+
+BOOST_AUTO_TEST_CASE(analyse_audio_with_strange_channel_count)
+{
+       auto content = content_factory(TestPaths::private_data() / "mali.mkv")[0];
+       auto film = new_test_film2("analyse_audio_with_strange_channel_count", { content });
+
+       auto playlist = make_shared<Playlist>();
+       playlist->add(film, content);
+       boost::signals2::connection c;
+       JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {});
+       BOOST_CHECK(!wait_for_jobs());
+}
+