Write MainSoundConfiguration tags with hyphens for unused channels (#2501).

[dcpomatic.git] / src / wx / verify_dcp_dialog.cc

diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index 3c4e1ef48ddd93ec3fcd833fe7595468e336b435..d88a030bb40b817eb4767a8d054ca0abcb95ac23 100644 (file)
--- 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."));
@@ -371,6 +371,36 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
                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;
+               case dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA:
+                       add(i, _("The <MainPictureActiveArea> is either not a multiple of 2, or is bigger than an asset."));
+                       break;
+               case dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL:
+                       add(i, _("The PKL %n has more than one asset with the same ID."));
+                       break;
+               case dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP:
+                       add(i, _("The ASSETMAP %n has more than one asset with the same ID."));
+                       break;
+               case dcp::VerificationNote::Code::MISSING_SUBTITLE:
+                       add(i, _("The subtitle asset %n contains no subtitles."));
+                       break;
+               case dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE:
+                       add(i, _("<IssueDate> has an invalid value %n"));
+                       break;
+               case dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS:
+                       add(i, _("Sound assets do not all have the same channel count."));
+                       break;
+               case dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION:
+                       add(i, _("<MainSoundConfiguration> describes incorrect number of channels (%n)"));
+                       break;
                }
        }