From 7c9d62fc64ca6d66a34063d2d01988d800b770c8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 31 Mar 2026 23:38:46 +0200
Subject: INVALID_{CPL,PKL}_NAMESPACE: note -> xml_namespace.

---
 src/cpl.cc    | 6 +-----
 src/pkl.cc    | 6 +-----
 src/verify.cc | 4 ++--
 src/verify.h  | 4 ++--
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/cpl.cc b/src/cpl.cc
index 0bc333c2..6ef529c7 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -127,11 +127,7 @@ CPL::CPL(boost::filesystem::path file, vector<dcp::VerificationNote>* notes)
 	} else {
 		if (notes) {
 			notes->push_back(
-				dcp::VerificationNote(
-					dcp::VerificationNote::Code::INVALID_CPL_NAMESPACE,
-					f.namespace_uri(),
-					file
-					)
+				dcp::VerificationNote(dcp::VerificationNote::Code::INVALID_CPL_NAMESPACE, file).set_xml_namespace(f.namespace_uri())
 				);
 		}
 		_standard = Standard::INTEROP;
diff --git a/src/pkl.cc b/src/pkl.cc
index 3b154316..0e36dbe6 100644
--- a/src/pkl.cc
+++ b/src/pkl.cc
@@ -80,11 +80,7 @@ PKL::PKL(boost::filesystem::path file, vector<dcp::VerificationNote>* notes)
 		_standard = Standard::SMPTE;
 		if (notes) {
 			notes->push_back(
-				dcp::VerificationNote(
-					dcp::VerificationNote::Code::INVALID_PKL_NAMESPACE,
-					pkl.namespace_uri(),
-					file
-					)
+				dcp::VerificationNote(dcp::VerificationNote::Code::INVALID_PKL_NAMESPACE, file).set_xml_namespace(pkl.namespace_uri())
 				);
 		}
 	} else {
diff --git a/src/verify.cc b/src/verify.cc
index 08b85d3d..40087346 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -2211,11 +2211,11 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str
 	case VerificationNote::Code::VALID_CONTENT_VERSION_LABEL_TEXT:
 		return compose("CPL has valid <ContentVersion> %1", *note.content_version());
 	case VerificationNote::Code::INVALID_CPL_NAMESPACE:
-		return compose("The namespace %1 in CPL %2 is invalid", note.note().get(), note.cpl_id().get());
+		return compose("The namespace %1 in CPL %2 is invalid", *note.xml_namespace(), note.cpl_id().get());
 	case VerificationNote::Code::MISSING_CPL_CONTENT_VERSION:
 		return compose("The CPL %1 has no <ContentVersion> tag", note.cpl_id().get());
 	case VerificationNote::Code::INVALID_PKL_NAMESPACE:
-		return compose("The namespace %1 in PKL %2 is invalid", note.note().get(), note.file()->filename());
+		return compose("The namespace %1 in PKL %2 is invalid", *note.xml_namespace(), note.file()->filename());
 	}
 
 	return "";
diff --git a/src/verify.h b/src/verify.h
index 96945ca3..5f678bae 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -584,7 +584,7 @@ public:
 		 */
 		VALID_CONTENT_VERSION_LABEL_TEXT,
 		/** The CPL namespace is not valid
-		 *  note contains the invalid namespace
+		 *  xml_namespace contains the invalid namespace
 		 *  file contains the CPL filename
 		 */
 		INVALID_CPL_NAMESPACE,
@@ -593,7 +593,7 @@ public:
 		 */
 		MISSING_CPL_CONTENT_VERSION,
 		/** The PKL namespace is not valid
-		 *  note contains the invalid namespace
+		 *  xml_namespace contains the invalid namespace
 		 *  file contains the PKL filename
 		 */
 		INVALID_PKL_NAMESPACE,
-- 
cgit v1.2.3