diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-03-29 13:41:58 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-04-01 23:43:00 +0200 |
| commit | d47514ac74ec18cd33481e54b459c4af542bbc19 (patch) | |
| tree | be10e29821f35638255d7662d8fa74f33fabc31c | |
| parent | 1252940b0be76e0cd8f6995a4967d04b65c1e599 (diff) | |
EXTERNAL_ASSET: note -> asset_id.
| -rw-r--r-- | src/dcp.cc | 2 | ||||
| -rw-r--r-- | src/verify.cc | 2 | ||||
| -rw-r--r-- | src/verify.h | 2 | ||||
| -rw-r--r-- | test/verify_test.cc | 6 |
4 files changed, 5 insertions, 7 deletions
@@ -334,7 +334,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m for (auto i: cpls()) { for (auto j: i->reel_file_assets()) { if (!j->asset_ref().resolved() && ids_and_paths.find(j->asset_ref().id()) == ids_and_paths.end()) { - notes->push_back(VerificationNote(VerificationNote::Code::EXTERNAL_ASSET, j->asset_ref().id())); + notes->push_back(VerificationNote(VerificationNote::Code::EXTERNAL_ASSET).set_asset_id(j->asset_ref().id())); } } } diff --git a/src/verify.cc b/src/verify.cc index fcee2967..7d87ba1f 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -2006,7 +2006,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str filename() ); case VerificationNote::Code::EXTERNAL_ASSET: - return compose("The asset %1 that this DCP refers to is not included in the DCP. It may be a VF.", note.note().get()); + return compose("The asset %asset_id that this DCP refers to is not included in the DCP. It may be a VF.", *note.asset_id()); case VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD: return compose("The asset %1 is 3D but its MXF is marked as 2D.", filename()); case VerificationNote::Code::INVALID_STANDARD: diff --git a/src/verify.h b/src/verify.h index fa239302..0abf6c22 100644 --- a/src/verify.h +++ b/src/verify.h @@ -190,7 +190,7 @@ public: */ NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, /** An asset that the CPL requires is not in this DCP; the DCP may be a VF - * note contains the asset ID + * asset_id contains the asset ID */ EXTERNAL_ASSET, /** A stereoscopic asset has an MXF which is marked as being monoscopic diff --git a/test/verify_test.cc b/test/verify_test.cc index 6b83e0ae..fd4db820 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -1570,7 +1570,7 @@ BOOST_AUTO_TEST_CASE (verify_external_asset) note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl), note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl), note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl), - { VC::EXTERNAL_ASSET, picture->asset()->id() }, + VN(VC::EXTERNAL_ASSET).set_asset_id(picture->asset()->id()), VN(VC::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id()) }); } @@ -5360,9 +5360,7 @@ BOOST_AUTO_TEST_CASE(verify_duplicate_assetmap_asset_ids) VN( VC::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map.id(), canonical(find_asset_map(dir)) ), - VN( - VC::EXTERNAL_ASSET, string("5407b210-4441-4e97-8b16-8bdc7c12da54") - ) + VN(VC::EXTERNAL_ASSET).set_asset_id("5407b210-4441-4e97-8b16-8bdc7c12da54"), }); } |