summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-11-29 00:28:25 +0100
committerCarl Hetherington <cth@carlh.net>2024-12-08 21:29:37 +0100
commiteee577a2146f537d3417eb919d0587ff3e15cd0d (patch)
tree0d30ece833ccd34665cdd61084ab7ecdbc2f6e20
parent0bf80c8e324110e89de6d72effd6da3c0d41a90b (diff)
Cleanup: use CPL from the context instead of an explicitly-passed copy.
-rw-r--r--src/verify.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/verify.cc b/src/verify.cc
index a0b8284f..f34e0fda 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1346,11 +1346,11 @@ verify_text_details(Context& context, vector<shared_ptr<Reel>> reels)
void
-verify_extension_metadata(Context& context, shared_ptr<const CPL> cpl)
+verify_extension_metadata(Context& context)
{
- DCP_ASSERT (cpl->file());
+ DCP_ASSERT(context.cpl->file());
cxml::Document doc ("CompositionPlaylist");
- doc.read_file(dcp::filesystem::fix_long_path(cpl->file().get()));
+ doc.read_file(dcp::filesystem::fix_long_path(context.cpl->file().get()));
auto missing = false;
string malformed;
@@ -1396,9 +1396,9 @@ verify_extension_metadata(Context& context, shared_ptr<const CPL> cpl)
}
if (missing) {
- context.bv21_error(VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->file().get());
+ context.bv21_error(VerificationNote::Code::MISSING_EXTENSION_METADATA, context.cpl->file().get());
} else if (!malformed.empty()) {
- context.bv21_error(VerificationNote::Code::INVALID_EXTENSION_METADATA, malformed, cpl->file().get());
+ context.bv21_error(VerificationNote::Code::INVALID_EXTENSION_METADATA, malformed, context.cpl->file().get());
}
}
@@ -1793,7 +1793,7 @@ verify_cpl(Context& context, shared_ptr<const CPL> cpl)
context.bv21_error(VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->file().get());
}
- verify_extension_metadata(context, cpl);
+ verify_extension_metadata(context);
if (cpl->any_encrypted()) {
cxml::Document doc("CompositionPlaylist");