summaryrefslogtreecommitdiff
path: root/test/test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-11 15:50:18 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-11 15:50:18 +0100
commit4122f932b1dc25f7a4592f49f2c9ab19d63b3a4e (patch)
treeda592cad1e8e7293d22dcc45839de2a0f11a1d68 /test/test.cc
parentbba1bd9b08eb78bda8cdf7fa1393f3eeb2a504d9 (diff)
Add test for audio delay, and do it in the player rather than the decoder.
Diffstat (limited to 'test/test.cc')
-rw-r--r--test/test.cc15
1 files changed, 11 insertions, 4 deletions
diff --git a/test/test.cc b/test/test.cc
index 0a682383a..dfa38c8f4 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -75,7 +75,7 @@ struct TestConfig
BOOST_GLOBAL_FIXTURE (TestConfig);
-boost::filesystem::path
+static boost::filesystem::path
test_film_dir (string name)
{
boost::filesystem::path p;
@@ -85,7 +85,7 @@ test_film_dir (string name)
return p;
}
-shared_ptr<Film>
+static shared_ptr<Film>
new_test_film (string name)
{
boost::filesystem::path p = test_film_dir (name);
@@ -98,7 +98,7 @@ new_test_film (string name)
return f;
}
-void
+static void
check_file (string ref, string check)
{
uintmax_t N = boost::filesystem::file_size (ref);
@@ -136,7 +136,7 @@ note (libdcp::NoteType, string n)
cout << n << "\n";
}
-void
+static void
check_dcp (string ref, string check)
{
libdcp::DCP ref_dcp (ref);
@@ -154,6 +154,13 @@ check_dcp (string ref, string check)
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
}
+static void
+wait_for_jobs ()
+{
+ while (JobManager::instance()->work_to_do ()) {}
+}
+
+#include "audio_delay_test.cc"
#include "ffmpeg_pts_offset.cc"
#include "ffmpeg_examiner_test.cc"
#include "black_fill_test.cc"