From: Carl Hetherington Date: Sun, 1 Jan 2023 19:57:45 +0000 (+0100) Subject: Cleanup: extract verify_assetmap(). X-Git-Tag: v1.8.50~9 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=f7dff91e6a4dffeace24280f5f5970d6cbd7a082;p=libdcp.git Cleanup: extract verify_assetmap(). --- diff --git a/src/verify.cc b/src/verify.cc index a797813a..b554612b 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1637,6 +1637,19 @@ verify_pkl( } + +static +void +verify_assetmap( + shared_ptr dcp, + boost::filesystem::path xsd_dtd_directory, + vector& notes + ) +{ + validate_xml(dcp->asset_map_path().get(), xsd_dtd_directory, notes); +} + + vector dcp::verify ( vector directories, @@ -1703,7 +1716,7 @@ dcp::verify ( if (dcp->asset_map_path()) { stage ("Checking ASSETMAP", dcp->asset_map_path().get()); - validate_xml (dcp->asset_map_path().get(), *xsd_dtd_directory, notes); + verify_assetmap(dcp, *xsd_dtd_directory, notes); } else { notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_ASSETMAP}); }