diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-03-31 00:37:36 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-12-15 17:13:38 +0100 |
| commit | 66c2461383099be4297ea473ae227b42d2c67282 (patch) | |
| tree | f1d910428266050e09c08ab5bb11bd4e0c0c7c88 /src | |
| parent | 5f38e198ade5825355ec68be1c86e32ced458822 (diff) | |
Use pkl_id for DUPLICATE_ASSET_ID_IN_PKL.
Diffstat (limited to 'src')
| -rw-r--r-- | src/verify.cc | 4 | ||||
| -rw-r--r-- | src/verify.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/verify.cc b/src/verify.cc index c6537bf6..dfe39547 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1849,7 +1849,7 @@ verify_pkl(Context& context, shared_ptr<const PKL> pkl) set<string> uuid_set; for (auto asset: pkl->assets()) { if (!uuid_set.insert(asset->id()).second) { - context.error(VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL, pkl->id(), pkl->file().get()); + context.add_note(VN(VN::Type::ERROR, VN::Code::DUPLICATE_ASSET_ID_IN_PKL, pkl->file().get()).set_pkl_id(pkl->id())); break; } } @@ -2213,7 +2213,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str case VerificationNote::Code::VALID_MAIN_PICTURE_ACTIVE_AREA: return compose("<MainPictureActiveaArea> %1 is valid", note.note().get()); 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().get()); 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 a1466b57..f88bc16d 100644 --- a/src/verify.h +++ b/src/verify.h @@ -474,7 +474,7 @@ public: /** A valid _<MainPictureActiveArea>_ was seen */ 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, |