X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fverify_dcp_dialog.cc;h=b761767284d66426bdaa54fc6eb204fe13dd88a6;hp=f39f6fa3bc0a22597d64b1dfafe08ad15b427c4c;hb=5215408c36898039e8fa294bb74bf94d5762b0c7;hpb=00762c2d9a4240d016150cd7555aee3dad8542ae diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index f39f6fa3b..b76176728 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 #include +#include DCPOMATIC_DISABLE_WARNINGS #include #include DCPOMATIC_ENABLE_WARNINGS + using std::list; using std::map; using std::shared_ptr; using std::string; +using std::vector; + VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr job) : wxDialog (parent, wxID_ANY, _("DCP verification"), wxDefaultPosition, {600, 400}) @@ -144,7 +149,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr 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 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; @@ -344,6 +352,31 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr job 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 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 node in a subtitle or closed caption is empty.")); + break; + case dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_VALIGN: + add(i, _("Some closed or nodes have different vertical alignments within a .")); + 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 tag inside a .")); + break; + case dcp::VerificationNote::Code::UNEXPECTED_DURATION: + add(i, _("There is a tag inside a .")); + break; } }