summaryrefslogtreecommitdiff
path: root/test/test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-12 23:26:07 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-12 23:26:07 +0000
commitb1f84f5635e4ebbd98882b39e5c5b19f62fe006e (patch)
treec98b3a917f0487235848cfc73e73074fbfcc9d25 /test/test.cc
parentc28b3d6f168607aca9995282b96647eb64a26dc9 (diff)
It builds again.
Diffstat (limited to 'test/test.cc')
-rw-r--r--test/test.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test.cc b/test/test.cc
index e43db71ef..1498cd8fe 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -130,9 +130,9 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
}
static void
-note (libdcp::NoteType t, string n)
+note (dcp::NoteType t, string n)
{
- if (t == libdcp::ERROR) {
+ if (t == dcp::ERROR) {
cerr << n << "\n";
}
}
@@ -140,16 +140,16 @@ note (libdcp::NoteType t, string n)
void
check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
{
- libdcp::DCP ref_dcp (ref);
+ dcp::DCP ref_dcp (ref);
ref_dcp.read ();
- libdcp::DCP check_dcp (check);
+ dcp::DCP check_dcp (check);
check_dcp.read ();
- libdcp::EqualityOptions options;
+ dcp::EqualityOptions options;
options.max_mean_pixel_error = 5;
options.max_std_dev_pixel_error = 5;
options.max_audio_sample_error = 255;
- options.cpl_names_can_differ = true;
+ options.cpl_annotation_texts_can_differ = true;
options.mxf_names_can_differ = true;
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));