diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-03-31 15:20:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-04-01 23:43:00 +0200 |
| commit | 01e7bb0bb80f50466912800bd327ec4f0d733542 (patch) | |
| tree | 535a587059ad0117b400c37f46cfb41141751893 /src/verify.cc | |
| parent | d7f52153b4e50858dcd382fb66c51afba0bf6029 (diff) | |
DUPLICATE_ASSET_ID_IN_ASSETMAP: note -> asset_map_id.
Diffstat (limited to 'src/verify.cc')
| -rw-r--r-- | src/verify.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/verify.cc b/src/verify.cc index caf2db03..094567da 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1840,7 +1840,7 @@ verify_assetmap(Context& context, shared_ptr<const DCP> dcp) set<string> uuid_set; for (auto const& asset: asset_map->assets()) { if (!uuid_set.insert(asset.id()).second) { - context.add_note(VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map->id(), asset_map->file().get()); + context.add_note(VerificationNote(VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map->file().get()).set_asset_map_id(asset_map->id())); break; } } @@ -2181,7 +2181,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL: 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()); + return compose("The ASSETMAP %1 has more than one asset with the same ID.", *note.asset_map_id()); case VerificationNote::Code::MISSING_SUBTITLE: return compose("The subtitle asset %1 has no subtitles.", note.note().get()); case VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE: @@ -2372,6 +2372,7 @@ dcp::operator== (dcp::VerificationNote const& a, dcp::VerificationNote const& b) a.frame_rate() == b.frame_rate() && a.cpl_id() == b.cpl_id() && a.pkl_id() == b.pkl_id() && + a.asset_map_id() == b.asset_map_id() && a.reference_hash() == b.reference_hash() && a.calculated_hash() == b.calculated_hash() && a.reel_index() == b.reel_index() && @@ -2515,6 +2516,10 @@ dcp::operator< (dcp::VerificationNote const& a, dcp::VerificationNote const& b) return less_than_optional(a.pkl_id(), b.pkl_id()); } + if (a.asset_map_id() != b.asset_map_id()) { + return less_than_optional(a.asset_map_id(), b.asset_map_id()); + } + if (a.reference_hash() != b.reference_hash()) { return less_than_optional(a.reference_hash(), b.reference_hash()); } |