diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-03-30 22:14:33 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-04-01 23:43:00 +0200 |
| commit | 613c7287fb3d24b34e16ff9820eabd67270bd825 (patch) | |
| tree | 9b47fd1baf33366d8d505f74a810ec57a8c9c605 /src | |
| parent | 7a1a6bb6cd9457a870b690ae8fb3a7912a97b118 (diff) | |
{IN,}VALID_CONTENT_KIND: note -> content_kind.
Diffstat (limited to 'src')
| -rw-r--r-- | src/verify.cc | 8 | ||||
| -rw-r--r-- | src/verify.h | 8 |
2 files changed, 10 insertions, 6 deletions
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<const CPL> 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<string (string)> process_str case VerificationNote::Code::UNEXPECTED_DURATION: return process_string("There is an <Duration> node inside a <MainMarkers>."); case VerificationNote::Code::INVALID_CONTENT_KIND: - return compose("<ContentKind> has an invalid value %1.", note.note().get()); + return compose("<ContentKind> has an invalid value %1.", *note.content_kind()); case VerificationNote::Code::VALID_CONTENT_KIND: - return compose("Valid <ContentKind> %1.", note.note().get()); + return compose("Valid <ContentKind> %1.", *note.content_kind()); case VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA: return compose("<MainPictureActiveaArea> 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 _<ContentKind>_ has been specified with either no scope or the SMPTE 429-7 scope, but which is not one of those allowed */ + /** A _<ContentKind>_ has an invalid value + * content_kind contains the invalid content kind + */ INVALID_CONTENT_KIND, - /** A valid _<ContentKind>_ was seen */ + /** A valid _<ContentKind>_ was seen + * content_kind contains the valid content kind + */ VALID_CONTENT_KIND, /** Either the width or height of a _<MainPictureActiveArea>_ in a CPL is either not an even number, or bigger than the corresponding asset dimension * note contains details of what is wrong |