diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-12 22:56:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-12 22:56:33 +0100 |
| commit | 841a3814241eba6d53c5d79800d4ed32df57e14a (patch) | |
| tree | 45a92f6ba8b92190f41bbbc3e1f53eb0bf1950c1 /src | |
| parent | 6f9adc9f7215a362d23e45b861017638ec67c723 (diff) | |
| parent | 3a71f7ffe55658f6662fcdcd5c413bfad110a30e (diff) | |
Merge branch 'main' into v2.17.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/verify_dcp_dialog.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index e86cb2c80..2b108c945 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -94,6 +94,14 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job if (note.calculated_hash()) { message.Replace("%calculated_hash", std_to_wx(note.calculated_hash().get())); } + if (note.frame()) { + message.Replace("%frame", std_to_wx(dcp::raw_convert<string>(note.frame().get()))); + message.Replace( + "%timecode", + std_to_wx( + dcp::Time(note.frame().get(), note.frame_rate().get(), note.frame_rate().get()).as_string(dcp::Standard::SMPTE) + )); + } if (note.note()) { message.Replace("%n", std_to_wx(note.note().get())); } @@ -103,9 +111,6 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job if (note.line()) { message.Replace("%l", std_to_wx(dcp::raw_convert<string>(note.line().get()))); } - if (note.frame()) { - message.Replace("%frame", std_to_wx(dcp::raw_convert<string>(note.frame().get()))); - } if (note.component()) { message.Replace("%component", std_to_wx(dcp::raw_convert<string>(note.component().get()))); } @@ -179,7 +184,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job add(i, _("At least one frame of the video asset %f is over the limit of 250Mbit/s.")); break; case dcp::VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES: - add(i, _("At least one frame of the video asset %f is close to the limit of 250MBit/s.")); + add(i, _("Frame %frame (timecode %timecode) in asset %f has an instantaneous bit rate that is close to the limit of 250Mbit/s.")); break; 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)")); |