Store CPL ID in CPL-related verification notes.

diff --git a/src/verify.cc b/src/verify.cc
index 64b1e8259a040313aba8f40fe853c079e0d2810c..7aa28b436760254ca587bf50d2c75c29ad712d73 100644 (file)
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -341,6 +341,9 @@ public:
 
        void add_note(dcp::VerificationNote note)
        {
+               if (cpl) {
+                       note.set_cpl_id(cpl->id());
+               }
                notes.push_back(std::move(note));
        }
 
@@ -609,7 +612,7 @@ verify_main_picture_asset(Context& context, shared_ptr<const ReelPictureAsset> r
                                                VerificationNote::Type::ERROR,
                                                VerificationNote::Code::INCORRECT_PICTURE_HASH,
                                                file
-                                               ).set_reference_hash(reference_hash).set_calculated_hash(calculated_hash)
+                                               ).set_cpl_id(context.cpl->id()).set_reference_hash(reference_hash).set_calculated_hash(calculated_hash)
                                        );
                                break;
                        case VerifyAssetResult::CPL_PKL_DIFFER:
@@ -686,7 +689,7 @@ verify_main_sound_asset(Context& context, shared_ptr<const ReelSoundAsset> reel_
                                                VerificationNote::Type::ERROR,
                                                VerificationNote::Code::INCORRECT_SOUND_HASH,
                                                file
-                                               ).set_reference_hash(reference_hash).set_calculated_hash(calculated_hash)
+                                               ).set_cpl_id(context.cpl->id()).set_reference_hash(reference_hash).set_calculated_hash(calculated_hash)
                                        );
                                break;
                        case VerifyAssetResult::CPL_PKL_DIFFER:
@@ -1612,9 +1615,8 @@ verify_cpl(Context& context, shared_ptr<const CPL> cpl)
                                dcp::VerificationNote(
                                        VerificationNote::Type::ERROR,
                                        VerificationNote::Code::MISMATCHED_CPL_HASHES,
-                                       cpl->id(),
                                        cpl->file().get()
-                                       ).set_calculated_hash(calculated_cpl_hash).set_reference_hash(*h)
+                                       ).set_cpl_id(cpl->id()).set_calculated_hash(calculated_cpl_hash).set_reference_hash(*h)
                                );
                } else {
                        context.ok(VerificationNote::Code::MATCHING_CPL_HASHES);
@@ -1895,7 +1897,9 @@ dcp::verify (
 
                for (auto cpl: dcp->cpls()) {
                        try {
+                               context.cpl = cpl;
                                verify_cpl(context, cpl);
+                               context.cpl.reset();
                        } catch (ReadError& e) {
                                notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
                        }
@@ -1944,7 +1948,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str
        case VerificationNote::Code::MATCHING_CPL_HASHES:
                return process_string("The hash of the CPL in the PKL matches the CPL file.");
        case VerificationNote::Code::MISMATCHED_CPL_HASHES:
-               return compose("The hash (%1) of the CPL (%2) in the PKL does not agree with the CPL file (%3).", note.reference_hash().get(), note.note().get(), note.calculated_hash().get());
+               return compose("The hash (%1) of the CPL (%2) in the PKL does not agree with the CPL file (%3).", note.reference_hash().get(), note.cpl_id().get(), note.calculated_hash().get());
        case VerificationNote::Code::INVALID_PICTURE_FRAME_RATE:
                return compose("The picture in a reel has an invalid frame rate %1.", note.note().get());
        case VerificationNote::Code::INCORRECT_PICTURE_HASH:
@@ -2040,9 +2044,9 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str
        case VerificationNote::Code::INVALID_SOUND_FRAME_RATE:
                return compose("The sound asset %1 has a sampling rate of %2", filename(), note.note().get());
        case VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT:
-               return compose("The CPL %1 has no <AnnotationText> tag.", note.note().get());
+               return compose("The CPL %1 has no <AnnotationText> tag.", note.cpl_id().get());
        case VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT:
-               return compose("The CPL %1 has an <AnnotationText> which differs from its <ContentTitleText>.", note.note().get());
+               return compose("The CPL %1 has an <AnnotationText> which differs from its <ContentTitleText>.", note.cpl_id().get());
        case VerificationNote::Code::MISMATCHED_ASSET_DURATION:
                return process_string("All assets in a reel do not have the same duration.");
        case VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS:
@@ -2072,15 +2076,15 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str
        case VerificationNote::Code::INCORRECT_LFOC:
                return compose("The LFOC marker is %1 instead of 1 less than the duration of the last reel.", note.note().get());
        case VerificationNote::Code::MISSING_CPL_METADATA:
-               return compose("The CPL %1 has no <CompositionMetadataAsset> tag.", note.note().get());
+               return compose("The CPL %1 has no <CompositionMetadataAsset> tag.", note.cpl_id().get());
        case VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER:
-               return compose("The CPL %1 has no <VersionNumber> in its <CompositionMetadataAsset>.", note.note().get());
+               return compose("The CPL %1 has no <VersionNumber> in its <CompositionMetadataAsset>.", note.cpl_id().get());
        case VerificationNote::Code::MISSING_EXTENSION_METADATA:
-               return compose("The CPL %1 has no <ExtensionMetadata> in its <CompositionMetadataAsset>.", note.note().get());
+               return compose("The CPL %1 has no <ExtensionMetadata> in its <CompositionMetadataAsset>.", note.cpl_id().get());
        case VerificationNote::Code::INVALID_EXTENSION_METADATA:
                return compose("The CPL %1 has a malformed <ExtensionMetadata> (%2).", filename(), note.note().get());
        case VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT:
-               return compose("The CPL %1, which has encrypted content, is not signed.", note.note().get());
+               return compose("The CPL %1, which has encrypted content, is not signed.", note.cpl_id().get());
        case VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT:
                return compose("The PKL %1, which has encrypted content, is not signed.", note.note().get());
        case VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL:
@@ -2179,7 +2183,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str
        case VerificationNote::Code::MISMATCHED_ASSET_MAP_ID:
                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 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());
        }
 
        return "";
@@ -2200,6 +2204,7 @@ dcp::operator== (dcp::VerificationNote const& a, dcp::VerificationNote const& b)
                a.id() == b.id() &&
                a.other_id() == b.other_id() &&
                a.frame_rate() == b.frame_rate() &&
+               a.cpl_id() == b.cpl_id() &&
                a.reference_hash() == b.reference_hash() &&
                a.calculated_hash() == b.calculated_hash();
 }

diff --git a/src/verify.h b/src/verify.h
index f0e71d83ad500a04c3f3b7b023d99bc13b47edab..24ada64d5617510a547628f8f1c66d7c724289ce 100644 (file)
--- a/src/verify.h
+++ b/src/verify.h
@@ -545,6 +545,7 @@ private:
                ID,
                OTHER_ID,
                FRAME_RATE,
+               CPL_ID,
                CALCULATED_HASH,
                REFERENCE_HASH
        };
@@ -644,6 +645,15 @@ public:
                return data<std::string>(Data::REFERENCE_HASH);
        }
 
+       VerificationNote& set_cpl_id(std::string id) {
+               _data[Data::CPL_ID] = id;
+               return *this;
+       }
+
+       boost::optional<std::string> cpl_id() const {
+               return data<std::string>(Data::CPL_ID);
+       }
+
 private:
        Type _type;
        Code _code;

diff --git a/test/verify_test.cc b/test/verify_test.cc
index b464a7c0c0c23ce0c95e1ab9c727e838d1874b18..2553d1cf82ba256b5fa375194c180db72e9e04c7 100644 (file)
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -216,9 +216,10 @@ check_verify_result(vector<path> dir, vector<dcp::DecryptedKDM> kdm, vector<dcp:
                        i.frame().get_value_or(0)
                        );
                message += dcp::String::compose(
-                       "%1 %2 %3 %4]\n",
+                       "%1 %2 %3 %4 %5]\n",
                        i.id().get_value_or("<none>"),
                        i.other_id().get_value_or("<none>"),
+                       i.cpl_id().get_value_or("<none>"),
                        i.reference_hash().get_value_or("<none>"),
                        i.calculated_hash().get_value_or("<none>")
                        );
@@ -236,9 +237,10 @@ check_verify_result(vector<path> dir, vector<dcp::DecryptedKDM> kdm, vector<dcp:
                        i.frame().get_value_or(0)
                        );
                message += dcp::String::compose(
-                       "%1 %2 %3 %4]\n",
+                       "%1 %2 %3 %4 %5]\n",
                        i.id().get_value_or("<none>"),
                        i.other_id().get_value_or("<none>"),
+                       i.cpl_id().get_value_or("<none>"),
                        i.reference_hash().get_value_or("<none>"),
                        i.calculated_hash().get_value_or("<none>")
                        );
@@ -399,10 +401,10 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_picture_sound_hash)
                {
                        dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_PICTURE_HASH, canonical(video_path)
-                               ).set_reference_hash(video_calc.old_hash()).set_calculated_hash(video_calc.new_hash()),
+                               ).set_cpl_id(dcp_test1_cpl_id()).set_reference_hash(video_calc.old_hash()).set_calculated_hash(video_calc.new_hash()),
                        dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_SOUND_HASH, canonical(audio_path)
-                               ).set_reference_hash(audio_calc.old_hash()).set_calculated_hash(audio_calc.new_hash()),
+                               ).set_cpl_id(dcp_test1_cpl_id()).set_reference_hash(audio_calc.old_hash()).set_calculated_hash(audio_calc.new_hash()),
                });
 }
 
@@ -425,10 +427,14 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id(), canonical(dir / dcp_test1_cpl())
-                               ).set_reference_hash("x" + calc.old_hash()).set_calculated_hash(calc.old_hash()),
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") },
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(dir / dcp_test1_cpl())
+                               ).set_cpl_id(dcp_test1_cpl_id()).set_reference_hash("x" + calc.old_hash()).set_calculated_hash(calc.old_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf")
+                               ).set_cpl_id(dcp_test1_cpl_id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf")
+                               ).set_cpl_id(dcp_test1_cpl_id()),
                        { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x3M7YTgvFKXXMEGLkIbV4miC90FE=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 28 },
                        { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xskI+5b/9LA/y6h0mcyxysJYanxI=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 12 },
                        { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xvsVjRV9vhTBPUWfE/TT1o2vdQsI=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 20 },
@@ -452,9 +458,11 @@ BOOST_AUTO_TEST_CASE (verify_failed_read_content_kind)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id(), canonical(dir / dcp_test1_cpl())
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("xtrailer") }
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(dir / dcp_test1_cpl())
+                               ).set_cpl_id(dcp_test1_cpl_id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("xtrailer")
+                               ).set_cpl_id(dcp_test1_cpl_id())
                });
 }
 
@@ -629,8 +637,11 @@ BOOST_AUTO_TEST_CASE (verify_invalid_standard)
        BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::Type::BV21_ERROR);
        BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::Code::INVALID_STANDARD);
        ++i;
-       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::Type::BV21_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K);
+       for (int j = 0; j < 24; ++j) {
+               BOOST_CHECK_EQUAL(i->type(), dcp::VerificationNote::Type::BV21_ERROR);
+               BOOST_CHECK_EQUAL(i->code(), dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K);
+               ++i;
+       }
 }
 
 /* DCP with a short asset */
@@ -643,22 +654,36 @@ BOOST_AUTO_TEST_CASE (verify_invalid_duration)
        BOOST_REQUIRE(dcp.cpls().size() == 1);
        auto cpl = dcp.cpls()[0];
 
-       check_verify_result (
-               { dir },
-               {},
-               {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, string("2") },
+       vector<dcp::VerificationNote> expected = {
+               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91")
+                       ).set_cpl_id(cpl->id()),
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91")
+                       ).set_cpl_id(cpl->id()),
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626")
+                       ).set_cpl_id(cpl->id()),
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626")
+                       ).set_cpl_id(cpl->id()),
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::WARNING,
+                       dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT,
+                       cpl->file().get()
+                       ).set_cpl_id(cpl->id())
+       };
+
+       for (int i = 0; i < 23; ++i) {
+               expected.push_back(
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::WARNING,
-                               dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT,
-                               cpl->file().get()
-                       ).set_id("d74fda30-d5f4-4c5f-870f-ebc089d97eb7")
-               });
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, string("2")
+                               ).set_cpl_id(cpl->id())
+                       );
+       }
+
+       check_verify_result({ dir }, {}, expected);
 }
 
 
@@ -702,7 +727,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_size_in_bytes)
                expected.push_back(
                        dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM, string("missing marker start byte")
-                               ).set_frame(i).set_frame_rate(24)
+                               ).set_frame(i).set_frame_rate(24).set_cpl_id(cpl->id())
                        );
        }
 
@@ -710,13 +735,15 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_size_in_bytes)
                expected.push_back(
                        dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf")
-                               ).set_frame(i).set_frame_rate(24)
+                               ).set_frame(i).set_frame_rate(24).set_cpl_id(cpl->id())
                        );
        }
 
        expected.push_back(
-               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
-       );
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                       ).set_cpl_id(cpl->id())
+               );
 
        check_verify_result({ dir }, {}, expected);
 }
@@ -746,7 +773,7 @@ BOOST_AUTO_TEST_CASE (verify_nearly_invalid_picture_frame_size_in_bytes)
                expected.push_back(
                        dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM, string("missing marker start byte")
-                               ).set_frame(i).set_frame_rate(24)
+                               ).set_frame(i).set_frame_rate(24).set_cpl_id(cpl->id())
                        );
        }
 
@@ -754,13 +781,15 @@ BOOST_AUTO_TEST_CASE (verify_nearly_invalid_picture_frame_size_in_bytes)
                expected.push_back(
                        dcp::VerificationNote(
                                dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf")
-                               ).set_frame(i).set_frame_rate(24)
+                               ).set_frame(i).set_frame_rate(24).set_cpl_id(cpl->id())
                );
        }
 
        expected.push_back(
-               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
-       );
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                       ).set_cpl_id(cpl->id())
+               );
 
        check_verify_result ({ dir }, {}, expected);
 }
@@ -777,7 +806,11 @@ BOOST_AUTO_TEST_CASE (verify_valid_picture_frame_size_in_bytes)
        prepare_directory (dir);
        auto cpl = dcp_from_frame (frame, dir);
 
-       check_verify_result({ dir }, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+       check_verify_result(
+               { dir },
+               {},
+               { dcp::VerificationNote(dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id()) }
+               );
 }
 
 
@@ -788,14 +821,16 @@ BOOST_AUTO_TEST_CASE (verify_valid_interop_subtitles)
        copy_file ("test/data/subs1.xml", dir / "subs.xml");
        auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
        auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-       write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+       auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
        check_verify_result (
                {dir},
                {},
                {
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -807,14 +842,16 @@ BOOST_AUTO_TEST_CASE(verify_catch_missing_font_file_with_interop_ccap)
        copy_file("test/data/subs1.xml", dir / "ccap.xml");
        auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "ccap.xml");
        auto reel_asset = make_shared<dcp::ReelInteropClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-       write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+       auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
        check_verify_result (
                {dir},
                {},
                {
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -828,7 +865,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
        copy_file ("test/data/subs1.xml", dir / "subs.xml");
        auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
        auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-       write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+       auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
        {
                Editor e (dir / "subs.xml");
@@ -840,15 +877,19 @@ BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
                {},
                {
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 5 },
-                       {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 5
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR,
                                dcp::VerificationNote::Code::INVALID_XML,
                                string("element 'Foo' is not allowed for content model '(SubtitleID,MovieTitle,ReelNumber,Language,LoadFont*,Font*,Subtitle*)'"),
                                path(),
                                29
-                       },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -860,15 +901,19 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_no_subtitles)
        copy_file("test/data/subs4.xml", dir / "subs.xml");
        auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
        auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-       write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+       auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
        check_verify_result (
                { dir },
                {},
                {
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get()) },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"} }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get())
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"theFontId"}
+                               ).set_cpl_id(cpl->id())
                });
 
 }
@@ -881,14 +926,16 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_single_space_subtitle)
        copy_file("test/data/subs5.xml", dir / "subs.xml");
        auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
        auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-       write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
+       auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
        check_verify_result (
                { dir },
                {},
                {
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"Arial"} }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"Arial"}
+                               ).set_cpl_id(cpl->id())
                });
 
 }
@@ -907,9 +954,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-04-14T13:19:14.000+02:00"} },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-04-14T13:19:14.000+02:00"}
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()
+                               ).set_cpl_id(cpl->id()),
                });
 }
 
@@ -930,18 +983,28 @@ BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 2 },
-                       {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 2
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR,
                                dcp::VerificationNote::Code::INVALID_XML,
                                string("element 'Foo' is not allowed for content model '(Id,ContentTitleText,AnnotationText?,IssueDate,ReelNumber?,Language?,EditRate,TimeCodeRate,StartTime?,DisplayType?,LoadFont*,SubtitleList)'"),
                                path(),
                                2
-                       },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2020-05-09T00:29:21.000+02:00"} },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2020-05-09T00:29:21.000+02:00"}
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()
+                               ).set_cpl_id(cpl->id()),
                });
 }
 
@@ -959,12 +1022,24 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-08-09T18:34:46.000+02:00"} },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-08-09T18:34:46.000+02:00"}
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -984,7 +1059,9 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_child_nodes)
                {},
                {
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"} }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"}
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1003,10 +1080,16 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_empty_child_nodes
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get()) },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE, asset->id(), boost::filesystem::canonical(asset->file().get())
+                               ).set_cpl_id(cpl->id()),
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"} },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_TEXT
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_FONT, string{"font0"}
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1035,7 +1118,9 @@ BOOST_AUTO_TEST_CASE (verify_external_asset)
                {},
                {
                        { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EXTERNAL_ASSET, picture->asset()->id() },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1138,9 +1223,13 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 50 },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 51 },
-                       {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 50
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 51
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR,
                                dcp::VerificationNote::Code::INVALID_XML,
                                string("element 'meta:MainSoundXConfiguration' is not allowed for content model "
@@ -1150,11 +1239,10 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
                                       "MainSoundSampleRate,MainPictureStoredArea,MainPictureActiveArea,MainSubtitleLanguageList?,"
                                       "ExtensionMetadataList?,)'"),
                                canonical(cpl->file().get()),
-                               71
-                       },
+                               71).set_cpl_id(cpl->id()),
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get())
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl->file().get())
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
                });
 }
 
@@ -1208,9 +1296,15 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language1)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1232,9 +1326,15 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language2)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1275,10 +1375,18 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("this-is-wrong") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("andso-is-this") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("fred-jim") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("frobozz") },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("this-is-wrong")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("andso-is-this")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("fred-jim")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("frobozz")
+                               ).set_cpl_id(cpl->id()),
                });
 }
 
@@ -1481,15 +1589,21 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-                       {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
                                dcp::VerificationNote::Type::BV21_ERROR,
                                dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES,
                                string("419371"),
                                canonical(dir / "subs.mxf")
-                       },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1526,11 +1640,21 @@ verify_timed_text_asset_too_large (string name)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121698284"), canonical(dir / "subs.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695488"), canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1577,15 +1701,20 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
        subs->write (dir / "subs.mxf");
 
        auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
-       dcp->cpls()[0]->reels()[0]->add(reel_subs);
+       auto cpl = dcp->cpls()[0];
+       cpl->reels()[0]->add(reel_subs);
        dcp->write_xml();
 
        check_verify_result (
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf") },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1623,9 +1752,15 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
                { path },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES
+                               ).set_cpl_id(cpl->id()),
                });
 }
 
@@ -1663,8 +1798,12 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
                { path },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf")
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1704,15 +1843,20 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
        subs->write (dir / "subs.mxf");
 
        auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
-       dcp->cpls()[0]->reels()[0]->add(reel_subs);
+       auto cpl = dcp->cpls()[0];
+       cpl->reels()[0]->add(reel_subs);
        dcp->write_xml();
 
        check_verify_result (
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1753,15 +1897,20 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
        subs->write (dir / "subs.mxf");
 
        auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
-       dcp->cpls().front()->reels().front()->add(reel_subs);
+       auto cpl = dcp->cpls()[0];
+       cpl->reels().front()->add(reel_subs);
        dcp->write_xml();
 
        check_verify_result (
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1854,8 +2003,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 
 }
@@ -1866,7 +2019,14 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time)
        auto const dir = path("build/test/verify_valid_subtitle_first_text_time");
        /* Just late enough */
        auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 5 * 24 }});
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -1911,7 +2071,14 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
        dcp->set_annotation_text("hello");
        dcp->write_xml();
 
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -1928,8 +2095,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1943,7 +2114,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
                        { 4 * 24,      5 * 24 },
                        { 5 * 24 + 16, 8 * 24 },
                });
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -1955,8 +2134,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -1965,7 +2148,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_duration)
 {
        auto const dir = path("build/test/verify_valid_subtitle_duration");
        auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 17 }});
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -1986,10 +2177,18 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "72 96", boost::filesystem::canonical(asset->file().get()) },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::SUBTITLE_OVERLAPS_REEL_BOUNDARY },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "72 96", boost::filesystem::canonical(asset->file().get())
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::SUBTITLE_OVERLAPS_REEL_BOUNDARY
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 
 }
@@ -2010,8 +2209,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2026,7 +2229,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
                        { 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
                        { 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
                });
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -2045,8 +2256,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2062,7 +2277,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
                        { 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
                        { 190, 250, 0.3, dcp::VAlign::CENTER, "lines" }
                });
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -2078,8 +2301,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2096,8 +2323,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2117,8 +2348,12 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT},
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2133,7 +2368,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
                        { 96, 200, 0.1, dcp::VAlign::CENTER, "have" },
                        { 96, 200, 0.2, dcp::VAlign::CENTER, "four" },
                });
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -2152,8 +2395,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT},
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2169,7 +2416,15 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
                        { 150, 180, 0.2, dcp::VAlign::CENTER, "four" },
                        { 190, 250, 0.3, dcp::VAlign::CENTER, "lines" }
                });
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -2181,11 +2436,14 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_length)
                {
                        { 96, 300, 0.0, dcp::VAlign::CENTER, "01234567890123456789012345678901" }
                });
+
        check_verify_result (
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2202,8 +2460,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2222,7 +2484,9 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign1)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2241,8 +2505,12 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign2)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_VALIGN },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_VALIGN
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2257,11 +2525,14 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering1)
                        { 96, 300, 0.1, dcp::VAlign::TOP, "is" },
                        { 96, 300, 0.2, dcp::VAlign::TOP, "fine" },
                });
-       check_verify_result (
+
+       check_verify_result(
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2276,11 +2547,14 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering2)
                        { 96, 300, 0.1, dcp::VAlign::BOTTOM, "is" },
                        { 96, 300, 0.0, dcp::VAlign::BOTTOM, "also fine" },
                });
-       check_verify_result (
+
+       check_verify_result(
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2293,8 +2567,12 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering3)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ORDERING },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ORDERING
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2303,11 +2581,14 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering4)
 {
        auto const dir = path ("build/test/verify_incorrect_closed_caption_ordering4");
        auto cpl = dcp_with_text_from_file<dcp::ReelSMPTEClosedCaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering4.xml");
-       check_verify_result (
+
+       check_verify_result(
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2337,8 +2618,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SOUND_FRAME_RATE, string("96000"), canonical(dir / "audiofoo.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SOUND_FRAME_RATE, string("96000"), canonical(dir / "audiofoo.mxf")
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2365,10 +2650,12 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get())
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, canonical(cpl->file().get())
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl->file().get())
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
                });
 }
 
@@ -2394,10 +2681,12 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get())
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, canonical(cpl->file().get())
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl->file().get())
+                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()).set_cpl_id(cpl->id())
                });
 }
 
@@ -2428,8 +2717,12 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_ASSET_DURATION },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), canonical(cpl->file().get()) }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_ASSET_DURATION
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(cpl->file().get())
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2500,8 +2793,12 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
                        { dir },
                        {},
                        {
-                               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS },
-                               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+                               dcp::VerificationNote(
+                                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS
+                                       ).set_cpl_id(cpl->id()),
+                               dcp::VerificationNote(
+                                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                                       ).set_cpl_id(cpl->id())
                        });
 
        }
@@ -2509,13 +2806,27 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
        {
                path dir ("build/test/verify_subtitles_must_be_in_all_reels2");
                auto cpl = verify_subtitles_must_be_in_all_reels_check (dir, true, true);
-               check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+               check_verify_result(
+                       {dir},
+                       {},
+                       {
+                               dcp::VerificationNote(
+                                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                                       ).set_cpl_id(cpl->id())
+                       });
        }
 
        {
                path dir ("build/test/verify_subtitles_must_be_in_all_reels1");
                auto cpl = verify_subtitles_must_be_in_all_reels_check (dir, false, false);
-               check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+               check_verify_result(
+                       {dir},
+                       {},
+                       {
+                               dcp::VerificationNote(
+                                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                                       ).set_cpl_id(cpl->id())
+                       });
        }
 }
 
@@ -2584,21 +2895,39 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
                        {dir},
                        {},
                        {
-                               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS },
-                               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                               dcp::VerificationNote(
+                                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS
+                                       ).set_cpl_id(cpl->id()),
+                               dcp::VerificationNote(
+                                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                                       ).set_cpl_id(cpl->id())
                        });
        }
 
        {
                path dir ("build/test/verify_closed_captions_must_be_in_all_reels2");
                auto cpl = verify_closed_captions_must_be_in_all_reels_check (dir, 4, 4);
-               check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+               check_verify_result(
+                       {dir},
+                       {},
+                       {
+                               dcp::VerificationNote(
+                                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                                       ).set_cpl_id(cpl->id())
+                       });
        }
 
        {
                path dir ("build/test/verify_closed_captions_must_be_in_all_reels3");
                auto cpl = verify_closed_captions_must_be_in_all_reels_check (dir, 0, 0);
-               check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+               check_verify_result(
+                       {dir},
+                       {},
+                       {
+                               dcp::VerificationNote(
+                                       dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                                       ).set_cpl_id(cpl->id())
+                       });
        }
 }
 
@@ -2641,8 +2970,12 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, code, subs->id() },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, code, subs->id()
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2710,9 +3043,11 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_HASH, asset_id }
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_HASH, asset_id
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2726,14 +3061,19 @@ verify_markers_test (
        )
 {
        auto dcp = make_simple (dir);
-       dcp->cpls()[0]->set_content_kind (dcp::ContentKind::FEATURE);
+       auto cpl = dcp->cpls()[0];
+       cpl->set_content_kind(dcp::ContentKind::FEATURE);
        auto markers_asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 24);
        for (auto const& i: markers) {
                markers_asset->set (i.first, i.second);
        }
-       dcp->cpls()[0]->reels()[0]->add(markers_asset);
+       cpl->reels()[0]->add(markers_asset);
        dcp->write_xml();
 
+       for (auto& note: test_notes) {
+               note.set_cpl_id(cpl->id());
+       }
+
        check_verify_result({dir}, {}, test_notes);
 }
 
@@ -2830,7 +3170,14 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
        cpl->unset_version_number();
        dcp->write_xml();
 
-       check_verify_result({dir}, {}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get() }});
+       check_verify_result(
+               {dir},
+               {},
+               {
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
+               });
 }
 
 
@@ -2855,9 +3202,11 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2882,9 +3231,11 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2909,11 +3260,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 70 },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77 },
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 70
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
                });
 }
 
@@ -2938,9 +3292,11 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> should be 'Application'"), cpl->file().get() },
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> should be 'Application'"), cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2965,9 +3321,11 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> property should be 'DCP Constraints Profile'"), cpl->file().get() },
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> property should be 'DCP Constraints Profile'"), cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -2992,11 +3350,15 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 74 },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 75 },
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 74
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 75
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash())
                });
 }
 
@@ -3021,9 +3383,11 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Value> property should be 'SMPTE-RDD-52:2020-Bv2.1'"), cpl->file().get() },
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Value> property should be 'SMPTE-RDD-52:2020-Bv2.1'"), cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -3048,11 +3412,14 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 72 },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 76 },
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 72
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 76).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
                });
 }
 
@@ -3077,11 +3444,15 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 71 },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77 },
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 71
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 77
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->file().get()
+                               ).set_cpl_id(cpl->id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
                });
 }
 
@@ -3095,30 +3466,46 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_cpl_with_encrypted_content)
                copy_file (i.path(), dir / i.path().filename());
        }
 
-       path const pkl = dir / ( "pkl_" + encryption_test_pkl_id() + ".xml" );
-       path const cpl = dir / ( "cpl_" + encryption_test_cpl_id() + ".xml");
+       path const pkl = dir / ( "pkl_" + encryption_test_pkl_id() + ".xml");
+       path const cpl_path = dir / ( "cpl_" + encryption_test_cpl_id() + ".xml");
 
-       HashCalculator calc(cpl);
+       HashCalculator calc(cpl_path);
 
        {
-               Editor e (cpl);
+               Editor e(cpl_path);
                e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
        }
 
+       dcp::CPL cpl(cpl_path);
+
        check_verify_result (
                {dir},
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, encryption_test_cpl_id(), canonical(cpl)
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, encryption_test_pkl_id(), canonical(pkl), },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, encryption_test_cpl_id(), canonical(cpl) },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, encryption_test_cpl_id(), canonical(cpl) }
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(cpl_path)
+                               ).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, encryption_test_pkl_id(), canonical(pkl)
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(cpl_path)
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, canonical(cpl_path)
+                               ).set_cpl_id(cpl.id())
                });
 }
 
@@ -3131,24 +3518,40 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_encrypted_content)
                copy_file (i.path(), dir / i.path().filename());
        }
 
-       path const cpl = dir / ("cpl_" + encryption_test_cpl_id() + ".xml");
+       path const cpl_path = dir / ("cpl_" + encryption_test_cpl_id() + ".xml");
        path const pkl = dir / ("pkl_" + encryption_test_pkl_id() + ".xml");
        {
                Editor e (pkl);
                e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
        }
 
+       dcp::CPL cpl(cpl_path);
+
        check_verify_result (
                {dir},
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, encryption_test_pkl_id(), canonical(pkl) },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, encryption_test_cpl_id(), canonical(cpl) },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, encryption_test_pkl_id(), canonical(pkl) },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, encryption_test_pkl_id(), canonical(pkl)
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(cpl_path)
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, encryption_test_pkl_id(), canonical(pkl)
+                               )
                });
 }
 
@@ -3233,7 +3636,9 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
                {dir},
                {},
                {
-                       {dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED},
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -3333,10 +3738,18 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf) },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_RESOURCE_ID },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf)
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_RESOURCE_ID
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -3399,11 +3812,21 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf) },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INCORRECT_TIMED_TEXT_ASSET_ID },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2018-10-02T12:25:14+02:00"} }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf)
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INCORRECT_TIMED_TEXT_ASSET_ID
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->file().get()
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, string{"2018-10-02T12:25:14+02:00"}
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -3411,18 +3834,20 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 /** Check a DCP with a 3D asset marked as 2D */
 BOOST_AUTO_TEST_CASE (verify_threed_marked_as_twod)
 {
+       auto const path = private_test / "data" / "xm";
+
        check_verify_result (
-               { private_test / "data" / "xm" },
+               { path },
                {},
                {
-                       {
+                       dcp::VerificationNote(
                                dcp::VerificationNote::Type::WARNING,
-                               dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, boost::filesystem::canonical(find_file(private_test / "data" / "xm", "j2c"))
-                       },
-                       {
+                               dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, boost::filesystem::canonical(find_file(path, "j2c"))
+                               ),
+                       dcp::VerificationNote(
                                dcp::VerificationNote::Type::BV21_ERROR,
                                dcp::VerificationNote::Code::INVALID_STANDARD
-                       },
+                               )
                });
 
 }
@@ -3452,10 +3877,14 @@ BOOST_AUTO_TEST_CASE (verify_unexpected_things_in_main_markers)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir))
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_ENTRY_POINT },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_DURATION },
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_ENTRY_POINT
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::UNEXPECTED_DURATION
+                               ).set_cpl_id(cpl.id())
                });
 }
 
@@ -3481,9 +3910,11 @@ BOOST_AUTO_TEST_CASE(verify_invalid_content_kind)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir))
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("trip") }
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CONTENT_KIND, string("trip")
+                               ).set_cpl_id(cpl.id()),
                });
 
 }
@@ -3510,10 +3941,9 @@ BOOST_AUTO_TEST_CASE(verify_valid_content_kind)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir))
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
                });
-
 }
 
 
@@ -3543,10 +3973,14 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_1)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir))
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 1997 is not a multiple of 2", canonical(find_cpl(dir)) },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 4080 is bigger than the asset height 1080", canonical(find_cpl(dir)) },
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 1997 is not a multiple of 2", canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 4080 is bigger than the asset height 1080", canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()),
                });
 }
 
@@ -3577,11 +4011,17 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_2)
                {},
                {
                        dcp::VerificationNote(
-                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl.id(), canonical(find_cpl(dir))
-                               ).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is not a multiple of 2", canonical(find_cpl(dir)) },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 9900 is bigger than the asset width 1998", canonical(find_cpl(dir)) },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is bigger than the asset height 1080", canonical(find_cpl(dir)) },
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()).set_reference_hash(calc.old_hash()).set_calculated_hash(calc.new_hash()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is not a multiple of 2", canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "width 9900 is bigger than the asset width 1998", canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA, "height 5125 is bigger than the asset height 1080", canonical(find_cpl(dir))
+                               ).set_cpl_id(cpl.id())
                });
 }
 
@@ -3627,13 +4067,18 @@ BOOST_AUTO_TEST_CASE(verify_duplicate_assetmap_asset_ids)
 
        dcp::PKL pkl(find_pkl(dir));
        dcp::AssetMap asset_map(find_asset_map(dir));
+       dcp::CPL cpl(find_cpl(dir));
 
        check_verify_result(
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map.id(), canonical(find_asset_map(dir)) },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EXTERNAL_ASSET, string("5407b210-4441-4e97-8b16-8bdc7c12da54") },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map.id(), canonical(find_asset_map(dir))
+                               ),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EXTERNAL_ASSET, string("5407b210-4441-4e97-8b16-8bdc7c12da54")
+                               )
                });
 }
 
@@ -3706,7 +4151,9 @@ BOOST_AUTO_TEST_CASE(verify_mismatched_sound_channel_counts)
                { path },
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, canonical(find_file(path, "audio2")) },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, canonical(find_file(path, "audio2"))
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -3757,7 +4204,9 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_sound_configuration)
                { path },
                {},
                {
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION, std::string{"MainSoundConfiguration has 6 channels but sound assets have 2"}, canonical(find_cpl(path)) },
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION, std::string{"MainSoundConfiguration has 6 channels but sound assets have 2"}, canonical(find_cpl(path))
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -3818,7 +4267,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
                expected.push_back(
                        dcp::VerificationNote(
                                dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(path / "video.mxf")
-                       ).set_frame(frame).set_frame_rate(24)
+                       ).set_frame(frame).set_frame_rate(24).set_cpl_id(cpl->id())
                );
        }
 
@@ -3833,17 +4282,21 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
                        expected.push_back(
                                dcp::VerificationNote(
                                        dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE
-                                       ).set_frame(frame).set_component(component).set_size(component_sizes[component])
+                                       ).set_frame(frame).set_component(component).set_size(component_sizes[component]).set_cpl_id(cpl->id())
                                );
                }
        }
 
        expected.push_back(
-               { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC }
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC
+                       ).set_cpl_id(cpl->id())
        );
 
        expected.push_back(
-               { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC }
+               dcp::VerificationNote(
+                       dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC
+                       ).set_cpl_id(cpl->id())
        );
 
        check_verify_result({ path }, {}, expected);
@@ -3853,16 +4306,33 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
 BOOST_AUTO_TEST_CASE(verify_too_many_subtitle_namespaces)
 {
        boost::filesystem::path const dir = "test/ref/DCP/subtitle_namespace_test";
+       dcp::DCP dcp(dir);
+       dcp.read();
+       BOOST_REQUIRE(!dcp.cpls().empty());
+       auto cpl = dcp.cpls()[0];
+
        check_verify_result(
                { dir },
                {},
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(find_file(dir, "sub_")) },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, "fc815694-7977-4a27-a8b3-32b9d4075e4c", canonical(find_file(dir, "cpl_")) },
-                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, std::string{"315de731-1173-484c-9a35-bdacf5a9d99d"} }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(find_file(dir, "sub_"))
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(find_file(dir, "cpl_"))
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, std::string{"315de731-1173-484c-9a35-bdacf5a9d99d"}
+                               ).set_cpl_id(cpl->id())
                });
 }
 
@@ -3878,14 +4348,14 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font_for_font)
        }
        auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
        auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-       write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+       auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
        check_verify_result (
                {dir},
                {},
                {
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
-                       dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT).set_id("theFontId")
+                       dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT).set_id("theFontId").set_cpl_id(cpl->id())
                });
 
 }
@@ -3926,14 +4396,15 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font)
        subs->write(dir / "subs.mxf");
 
        auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 202, 0);
-       dcp->cpls()[0]->reels()[0]->add(reel_subs);
+       auto cpl = dcp->cpls()[0];
+       cpl->reels()[0]->add(reel_subs);
        dcp->write_xml();
 
        check_verify_result (
                { dir },
                {},
                {
-                       dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT).set_id(reel_subs->id())
+                       dcp::VerificationNote(dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_LOAD_FONT).set_id(reel_subs->id()).set_cpl_id(cpl->id())
                });
 }
 
@@ -3979,7 +4450,7 @@ BOOST_AUTO_TEST_CASE(verify_cpl_content_version_label_text_empty)
                {dir},
                {},
                {
-                       dcp::VerificationNote(dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_id(cpl->id())
+                       dcp::VerificationNote(dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_cpl_id(cpl->id())
                });
 }
 
@@ -4002,9 +4473,15 @@ BOOST_AUTO_TEST_CASE(verify_encrypted_smpte_dcp)
                { dir },
                { kdm },
                {
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), canonical(cpl_file) },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl->id(), canonical(cpl_file) },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, filename_to_id(pkl_file.filename()), canonical(pkl_file) }
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, canonical(cpl_file)
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, canonical(cpl_file)
+                               ).set_cpl_id(cpl->id()),
+                       dcp::VerificationNote(
+                               dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, filename_to_id(pkl_file.filename()), canonical(pkl_file)
+                               )
                });
 }