X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fverify_dcp_dialog.cc;h=bb51baeace6ba87b2508f300a8610c955fb1338f;hb=0a5d3c77247d3e68a144bfc077c29fbcf3819735;hp=55bbc99c358ce0f5ac9101f8cb1721449abf37b2;hpb=3a524440627cd47b3687c666ec55b975f90f8d1e;p=dcpomatic.git

diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index 55bbc99c3..bb51baeac 100644
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -22,14 +22,14 @@
 #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>
-#include <boost/algorithm/string.hpp>
-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;
@@ -149,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."));
@@ -338,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."));
@@ -365,6 +365,21 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 		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;
+		case dcp::VerificationNote::Code::INVALID_CONTENT_KIND:
+			add(i, _("An invalid <ContentKind> %n has been used."));
+			break;
 		}
 	}