diff options
| -rw-r--r-- | src/verify.cc | 4 | ||||
| -rw-r--r-- | src/verify.h | 2 | ||||
| -rw-r--r-- | test/verify_test.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/verify.cc b/src/verify.cc index 6b86958d..92da919c 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1727,7 +1727,7 @@ verify_cpl(Context& context, shared_ptr<const CPL> cpl) if (ffoc == markers_seen.end()) { context.add_note(VerificationNote::Code::MISSING_FFOC); } else if (ffoc->second.as_editable_units() != 1) { - context.add_note(VerificationNote::Code::INCORRECT_FFOC, fmt::to_string(ffoc->second.as_editable_units())); + context.add_note(VerificationNote(VerificationNote::Code::INCORRECT_FFOC).set_time(ffoc->second)); } auto lfoc = markers_seen.find(Marker::LFOC); @@ -2092,7 +2092,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str case VerificationNote::Code::MISSING_LFOC: return process_string("There should be a LFOC (last frame of content) marker."); case VerificationNote::Code::INCORRECT_FFOC: - return compose("The FFOC marker is %1 instead of 1", note.note().get()); + return compose("The FFOC marker is %1 instead of 1", note.time()->as_string(dcp::Standard::SMPTE)); case VerificationNote::Code::INCORRECT_LFOC: return compose("The LFOC marker is %1 instead of 1 less than the duration of the last reel.", note.note().get()); case VerificationNote::Code::MISSING_CPL_METADATA: diff --git a/src/verify.h b/src/verify.h index 8a6bcfe9..6ee8e5f0 100644 --- a/src/verify.h +++ b/src/verify.h @@ -349,7 +349,7 @@ public: /** There should be a LFOC marker */ MISSING_LFOC, /** The FFOC marker should be 1 - * note contains the incorrect value. + * time contains the incorrect time */ INCORRECT_FFOC, /** The LFOC marker should be the last frame in the reel diff --git a/test/verify_test.cc b/test/verify_test.cc index 20206c0b..1add49d0 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -4146,7 +4146,7 @@ BOOST_AUTO_TEST_CASE (verify_markers) { dcp::Marker::LFOC, dcp::Time(23, 24, 24) } }, { - { VC::INCORRECT_FFOC, string("3") } + { VN(VC::INCORRECT_FFOC).set_time(dcp::Time(3, 24, 24)) } }); verify_markers_test ( |