From d7f52153b4e50858dcd382fb66c51afba0bf6029 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Mar 2026 23:28:29 +0200 Subject: DUPLICATE_ASSET_ID_IN_PKL: note -> pkl_id. --- src/verify.cc | 4 ++-- src/verify.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/verify.cc b/src/verify.cc index 0c993fd5..caf2db03 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1820,7 +1820,7 @@ verify_pkl(Context& context, shared_ptr pkl) set uuid_set; for (auto asset: pkl->assets()) { if (!uuid_set.insert(asset->id()).second) { - context.add_note(VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL, pkl->id(), pkl->file().get()); + context.add_note(VerificationNote(VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL, pkl->file().get()).set_pkl_id(pkl->id())); break; } } @@ -2179,7 +2179,7 @@ dcp::note_to_string(VerificationNote note, function process_str case VerificationNote::Code::VALID_MAIN_PICTURE_ACTIVE_AREA: return compose(" %1x%2 is valid", note.size_in_pixels()->width, note.size_in_pixels()->height); case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL: - return compose("The PKL %1 has more than one asset with the same ID.", note.note().get()); + return compose("The PKL %1 has more than one asset with the same ID.", *note.pkl_id()); case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP: return compose("The ASSETMAP %1 has more than one asset with the same ID.", note.note().get()); case VerificationNote::Code::MISSING_SUBTITLE: diff --git a/src/verify.h b/src/verify.h index 6d93384a..07a480a7 100644 --- a/src/verify.h +++ b/src/verify.h @@ -510,7 +510,7 @@ public: */ VALID_MAIN_PICTURE_ACTIVE_AREA, /** A PKL has more than one asset with the same ID - * note contains the PKL ID + * pkl_id contains the PKL ID * file contains the PKL filename */ DUPLICATE_ASSET_ID_IN_PKL, -- cgit v1.2.3