X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=b82af3e2f4570782ccffbde6ef88e8f575642041;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=cbd12e1ee363cf7d6a592703db2d7984980d2193;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index cbd12e1ee..b82af3e2f 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -109,7 +109,7 @@ setup_test_config ()
 	Config::instance()->set_default_still_length (10);
 	Config::instance()->set_log_types (
 		LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING |
-		LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_THREED |
+		LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_THREE_D |
 		LogEntry::TYPE_DEBUG_ENCODE | LogEntry::TYPE_DEBUG_PLAYER |
 		LogEntry::TYPE_DISK
 		);
@@ -339,9 +339,9 @@ static
 double
 rms_error (boost::filesystem::path ref, boost::filesystem::path check)
 {
-	FFmpegImageProxy ref_proxy (ref, VIDEO_RANGE_FULL);
+	FFmpegImageProxy ref_proxy (ref, VideoRange::FULL);
 	shared_ptr<Image> ref_image = ref_proxy.image().image;
-	FFmpegImageProxy check_proxy (check, VIDEO_RANGE_FULL);
+	FFmpegImageProxy check_proxy (check, VideoRange::FULL);
 	shared_ptr<Image> check_image = check_proxy.image().image;
 
 	BOOST_REQUIRE_EQUAL (ref_image->pixel_format(), check_image->pixel_format());
@@ -798,7 +798,7 @@ dcp::operator<< (std::ostream& s, dcp::Size i)
 }
 
 std::ostream&
-dcp::operator<< (std::ostream& s, Standard t)
+dcp::operator<< (std::ostream& s, dcp::Standard t)
 {
 	switch (t) {
 	case Standard::INTEROP:
@@ -811,3 +811,10 @@ dcp::operator<< (std::ostream& s, Standard t)
 	return s;
 }
 
+std::ostream&
+operator<< (std::ostream&s, VideoFrameType f)
+{
+	s << video_frame_type_to_string(f);
+	return s;
+}
+