Merge remote-tracking branch 'origin/main' into v1.9.x

diff --cc src/cpl.cc
Simple merge

diff --cc src/dcp.cc
Simple merge

diff --cc src/verify.cc
index a61c3a923fcca2dbc601413304abccc3aac8355d,112a5bb5ed810c7e40afbf0c1e02ebaf54811a93..cfcce04f0e64114d1312698f05003b5c38781aae
--- 1/src/verify.cc
--- 2/src/verify.cc
+++ b/src/verify.cc
@@@ -2192,17 -2169,19 +2192,21 @@@ dcp::note_to_string(VerificationNote no
                        note.frame().get(), note.component().get(), note.size().get()
                        );
        case VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT:
 -              return String::compose("The XML in the subtitle asset %1 has more than one namespace declaration.", note.note().get());
 +              return compose("The XML in the subtitle asset %1 has more than one namespace declaration.", note.note().get());
        case VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT:
 -              return String::compose("A subtitle or closed caption refers to a font with ID %1 that does not have a corresponding <LoadFont> node", note.id().get());
 +              return compose("A subtitle or closed caption refers to a font with ID %1 that does not have a corresponding <LoadFont> node", note.id().get());
        case VerificationNote::Code::MISSING_LOAD_FONT:
 -              return String::compose("The SMPTE subtitle asset %1 has <Text> nodes but no <LoadFont> node", note.id().get());
 +              return compose("The SMPTE subtitle asset %1 has <Text> nodes but no <LoadFont> node", note.id().get());
        case VerificationNote::Code::MISMATCHED_ASSET_MAP_ID:
 -              return String::compose("The asset with ID %1 in the asset map actually has an id of %2", note.id().get(), note.other_id().get());
 +              return compose("The asset with ID %1 in the asset map actually has an id of %2", note.id().get(), note.other_id().get());
        case VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT:
 -              return String::compose("The <LabelText> in a <ContentVersion> in CPL %1 is empty", note.id().get());
 +              return compose("The <LabelText> in a <ContentVersion> in CPL %1 is empty", note.cpl_id().get());
 +      case VerificationNote::Code::VALID_CONTENT_VERSION_LABEL_TEXT:
 +              return compose("CPL has valid <ContentVersion> %1", note.note().get());
+       case VerificationNote::Code::INVALID_CPL_NAMESPACE:
 -              return String::compose("The namespace %1 in CPL %2 is invalid", note.note().get(), note.file()->filename());
++              return compose("The namespace %1 in CPL %2 is invalid", note.note().get(), note.cpl_id().get());
+       case VerificationNote::Code::MISSING_CPL_CONTENT_VERSION:
 -              return String::compose("The CPL %1 has no <ContentVersion> tag", note.note().get());
++              return compose("The CPL %1 has no <ContentVersion> tag", note.cpl_id().get());
        }
  
        return "";

diff --cc src/verify.h
index 77b657600540d661612d2cee6450ebdb774ee099,b5d913bdc9b6f9537a852e2f28e316188a5615d1..b9e3623f8e0fb478709dc5d50ce85da02667a9e5
--- 1/src/verify.h
--- 2/src/verify.h
+++ b/src/verify.h
@@@ -491,7 -475,16 +491,16 @@@ public
                 *  file contains the CPL filename
                 */
                EMPTY_CONTENT_VERSION_LABEL_TEXT,
 -               *  note contains the CPL ID
 +              VALID_CONTENT_VERSION_LABEL_TEXT,
+               /** The CPL namespace is not valid.
+                *  note contains the invalid namespace
+                *  file contains the CPL filename
+                */
+               INVALID_CPL_NAMESPACE,
+               /** A SMPTE CPL does not contain a _<ContentVersion>_ tag
+                *  file contains the CPL filename
+                */
+               MISSING_CPL_CONTENT_VERSION
        };
  
        VerificationNote (Type type, Code code)