X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fverify_dcp_dialog.cc;h=6d1d157c1704cfa585a253eb5929786dfcc38a91;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=c8a3ad321cbca3740238e2f63dc350382d59270a;hpb=cdb95926a42948144dad16c227e9cc01a00d49b8;p=dcpomatic.git

diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index c8a3ad321..6d1d157c1 100644
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -18,21 +18,26 @@
 
 */
 
+
 #include "verify_dcp_dialog.h"
 #include "wx_util.h"
 #include "lib/verify_dcp_job.h"
-#include "lib/warnings.h"
-#include <dcp/verify.h>
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/verify.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
 #include <wx/notebook.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+#include <boost/algorithm/string.hpp>
+
 
 using std::list;
 using std::map;
 using std::shared_ptr;
 using std::string;
+using std::vector;
+
 
 VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job)
 	: wxDialog (parent, wxID_ANY, _("DCP verification"), wxDefaultPosition, {600, 400})
@@ -144,7 +149,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 			add(i, _("No ASSETMAP or ASSETMAP.xml file was found."));
 			break;
 		case dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION:
-			add(i, _("The asset %n has an instrinsic duration of less than 1 second, which is invalid."));
+			add(i, _("The asset %n has an intrinsic duration of less than 1 second, which is invalid."));
 			break;
 		case dcp::VerificationNote::Code::INVALID_DURATION:
 			add(i, _("The asset %n has a duration of less than 1 second, which is invalid."));
@@ -158,6 +163,9 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 		case dcp::VerificationNote::Code::EXTERNAL_ASSET:
 			add(i, _("This DCP refers to at the asset %n in another DCP (and perhaps others), so it is a \"version file\" (VF)"));
 			break;
+		case dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD:
+			add(i, _("The asset %f is 3D but its MXF is marked as 2D."));
+			break;
 		case dcp::VerificationNote::Code::INVALID_STANDARD:
 			add(i, _("This DCP uses the Interop standard, but it should be made with SMPTE."));
 			break;
@@ -330,7 +338,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 			add(i, _("A 2K JPEG2000 frame contains %n tile parts instead of 3."));
 			break;
 		case dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_PARTS_FOR_4K:
-			add(i, _("A 2K JPEG2000 frame contains %n tile parts instead of 6."));
+			add(i, _("A 4K JPEG2000 frame contains %n tile parts instead of 6."));
 			break;
 		case dcp::VerificationNote::Code::MISSING_JPEG200_TLM_MARKER:
 			add(i, _("A JPEG2000 frame has no TLM marker."));
@@ -338,6 +346,37 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 		case dcp::VerificationNote::Code::SUBTITLE_OVERLAPS_REEL_BOUNDARY:
 			add(i, _("A subtitle lasts longer than the reel it is in."));
 			break;
+		case dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_RESOURCE_ID:
+			add(i, _("The Resource ID in a timed text MXF did not match the ID of the contained XML."));
+			break;
+		case dcp::VerificationNote::Code::INCORRECT_TIMED_TEXT_ASSET_ID:
+			add(i, _("The Asset ID in a timed text MXF is the same as the Resource ID or that of the contained XML."));
+			break;
+		case dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION:
+		{
+			vector<string> parts;
+			boost::split (parts, i.note().get(), boost::is_any_of(" "));
+			add(i, wxString::Format(_("The reel duration (%s) of some timed text is not the same as the ContainerDuration (%s) of its MXF."), std_to_wx(parts[0]), std_to_wx(parts[1])));
+			break;
+		}
+		case dcp::VerificationNote::Code::MISSED_CHECK_OF_ENCRYPTED:
+			add(i, _("Part of the DCP could not be checked because no KDM was available."));
+			break;
+		case dcp::VerificationNote::Code::EMPTY_TEXT:
+			add(i, _("At least one <Text> node in a subtitle or closed caption is empty."));
+			break;
+		case dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_VALIGN:
+			add(i, _("Some closed <Text> or <Image> nodes have different vertical alignments within a <Subtitle>."));
+			break;
+		case dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ORDERING:
+			add(i, _("Some closed captions are not listed in the order of their vertical position."));
+			break;
+		case dcp::VerificationNote::Code::UNEXPECTED_ENTRY_POINT:
+			add(i, _("There is a <EntryPoint> tag inside a <MainMarkers>."));
+			break;
+		case dcp::VerificationNote::Code::UNEXPECTED_DURATION:
+			add(i, _("There is a <Duration> tag inside a <MainMarkers>."));
+			break;
 		}
 	}