Put current frame position in seek-by-frame dialogue when opening it (#1736).

[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 a61d9bf11a959f19eb37e6ee1520c8d5e3347271..c11246d23a5fc9ac89128405e4e477a9fa63c333 100644 (file)
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -84,7 +84,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
                case dcp::VerificationNote::PICTURE_HASH_INCORRECT:
                        text = wxString::Format(
                                _("The hash of the picture asset %s does not agree with the PKL file.  This probably means that the asset file is corrupt."),
-                               std_to_wx(i.file()->filename().string()).data()
+                               std_to_wx(i.file()->filename().string())
                                );
                        break;
                case dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE:
@@ -93,7 +93,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
                case dcp::VerificationNote::SOUND_HASH_INCORRECT:
                        text = wxString::Format(
                                _("The hash of the sound asset %s does not agree with the PKL file.  This probably means that the asset file is corrupt."),
-                               std_to_wx(i.file()->filename().string()).data()
+                               std_to_wx(i.file()->filename().string())
                                );
                        break;
                case dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE:
@@ -111,17 +111,26 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
                case dcp::VerificationNote::XML_VALIDATION_ERROR:
                        if (i.line()) {
                                text = wxString::Format(
-                                       _("The XML in %s is malformed on line %d."),
-                                       std_to_wx(i.file()->filename().string()).data(),
+                                       _("The XML in %s is malformed on line %" PRIu64 "."),
+                                       std_to_wx(i.file()->filename().string()),
                                        i.line().get()
                                        );
                        } else {
                                text = wxString::Format(
                                        _("The XML in %s is malformed."),
-                                       std_to_wx(i.file()->filename().string()).data()
+                                       std_to_wx(i.file()->filename().string())
                                        );
                        }
                        break;
+               case dcp::VerificationNote::MISSING_ASSETMAP:
+                       text = _("No ASSETMAP or ASSETMAP.xml file was found.");
+                       break;
+               case dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL:
+                       text = _("An asset has an instrinsic duration of less than 1 second, which is invalid.");
+                       break;
+               case dcp::VerificationNote::DURATION_TOO_SMALL:
+                       text = _("An asset has a duration of less than 1 second, which is invalid.");
+                       break;
                }
 
                _text->WriteText (text);