From: Carl Hetherington <cth@carlh.net>
Date: Mon, 9 Mar 2020 20:07:30 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v1.8.0~384
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=5f8a8d0b4e6a476f6b4d8da655fdff51bdcab8fd;p=libdcp.git

Merge.
---

5f8a8d0b4e6a476f6b4d8da655fdff51bdcab8fd
diff --cc src/verify.cc
index c91257be,a8c5001c..66cd25e4
--- a/src/verify.cc
+++ b/src/verify.cc
@@@ -468,8 -482,10 +485,12 @@@ dcp::note_to_string (dcp::VerificationN
  		return "The DCP contains both SMPTE and Interop parts.";
  	case dcp::VerificationNote::XML_VALIDATION_ERROR:
  		return String::compose("An XML file is badly formed: %1 (%2:%3)", note.note().get(), note.file()->filename(), note.line().get());
 +	case dcp::VerificationNote::MISSING_ASSETMAP:
 +		return "No ASSETMAP or ASSETMAP.xml was found";
+ 	case dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL:
+ 		return String::compose("The intrinsic duration of an asset is less than 1 second long: %1", note.note().get());
+ 	case dcp::VerificationNote::DURATION_TOO_SMALL:
+ 		return String::compose("The duration of an asset is less than 1 second long: %1", note.note().get());
  	}
  
  	return "";
diff --cc src/verify.h
index 89069bdd,c56cfb9d..38c9ee75
--- a/src/verify.h
+++ b/src/verify.h
@@@ -77,8 -77,10 +77,12 @@@ public
  		MISMATCHED_STANDARD,
  		/** Some XML fails to validate against the XSD/DTD */
  		XML_VALIDATION_ERROR,
 +		/** No ASSETMAP{.xml} was found */
 +		MISSING_ASSETMAP
+ 		/** An asset's IntrinsicDuration is less than 1 second */
+ 		INTRINSIC_DURATION_TOO_SMALL,
+ 		/** An asset's Duration is less than 1 second */
+ 		DURATION_TOO_SMALL
  	};
  
  	VerificationNote (Type type, Code code)