From 613c7287fb3d24b34e16ff9820eabd67270bd825 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Mar 2026 22:14:33 +0200 Subject: {IN,}VALID_CONTENT_KIND: note -> content_kind. --- src/verify.cc | 8 ++++---- src/verify.h | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/verify.cc b/src/verify.cc index 3055a33b..40a7d44f 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1553,9 +1553,9 @@ verify_cpl(Context& context, shared_ptr cpl) transform(name.begin(), name.end(), name.begin(), ::tolower); auto iter = std::find_if(all.begin(), all.end(), [name](ContentKind const& k) { return !k.scope() && k.name() == name; }); if (iter == all.end()) { - context.add_note(VerificationNote::Code::INVALID_CONTENT_KIND, cpl->content_kind().name()); + context.add_note(VerificationNote(VerificationNote::Code::INVALID_CONTENT_KIND).set_content_kind(cpl->content_kind().name())); } else { - context.add_note(VerificationNote::Code::VALID_CONTENT_KIND, cpl->content_kind().name()); + context.add_note(VerificationNote(VerificationNote::Code::VALID_CONTENT_KIND).set_content_kind(cpl->content_kind().name())); } } @@ -2170,9 +2170,9 @@ dcp::note_to_string(VerificationNote note, function process_str case VerificationNote::Code::UNEXPECTED_DURATION: return process_string("There is an node inside a ."); case VerificationNote::Code::INVALID_CONTENT_KIND: - return compose(" has an invalid value %1.", note.note().get()); + return compose(" has an invalid value %1.", *note.content_kind()); case VerificationNote::Code::VALID_CONTENT_KIND: - return compose("Valid %1.", note.note().get()); + return compose("Valid %1.", *note.content_kind()); case VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA: return compose(" has an invalid value: %1", note.note().get()); case VerificationNote::Code::VALID_MAIN_PICTURE_ACTIVE_AREA: diff --git a/src/verify.h b/src/verify.h index 21ef1857..b2e8000f 100644 --- a/src/verify.h +++ b/src/verify.h @@ -491,9 +491,13 @@ public: * reel_index contains the reel index (starting from 0) */ UNEXPECTED_DURATION, - /** A __ has been specified with either no scope or the SMPTE 429-7 scope, but which is not one of those allowed */ + /** A __ has an invalid value + * content_kind contains the invalid content kind + */ INVALID_CONTENT_KIND, - /** A valid __ was seen */ + /** A valid __ was seen + * content_kind contains the valid content kind + */ VALID_CONTENT_KIND, /** Either the width or height of a __ in a CPL is either not an even number, or bigger than the corresponding asset dimension * note contains details of what is wrong -- cgit v1.2.3