{MISSING,INCORRECT}_{SUBTITLE,CLOSED_CAPTION}_ENTRY_POINT: note -> asset_id.

3 files changed, 13 insertions, 13 deletions

diff --git a/src/verify.cc b/src/verify.cc
index d4cd4b3f..2d3031d5 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -669,9 +669,9 @@ verify_main_subtitle_reel(Context& context, shared_ptr<const ReelTextAsset> reel
 	}
 
 	if (!reel_asset->entry_point()) {
-		context.add_note(VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT, reel_asset->id());
+		context.add_note(VerificationNote(VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT).set_asset_id(reel_asset->id()));
 	} else if (reel_asset->entry_point().get()) {
-		context.add_note(VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT, reel_asset->id());
+		context.add_note(VerificationNote(VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT).set_asset_id(reel_asset->id()));
 	}
 }
 
@@ -685,9 +685,9 @@ verify_closed_caption_reel(Context& context, shared_ptr<const ReelTextAsset> ree
 	}
 
 	if (!reel_asset->entry_point()) {
-		context.add_note(VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT, reel_asset->id());
+		context.add_note(VerificationNote(VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT).set_asset_id(reel_asset->id()));
 	} else if (reel_asset->entry_point().get()) {
-		context.add_note(VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT, reel_asset->id());
+		context.add_note(VerificationNote(VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT).set_asset_id(reel_asset->id()));
 	}
 }
 
@@ -2074,13 +2074,13 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str
 	case VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS:
 		return process_string("At least one reel has closed captions, but reels have different numbers of closed caption assets.");
 	case VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT:
-		return compose("The subtitle asset %1 has no <EntryPoint> tag.", note.note().get());
+		return compose("The subtitle asset %1 has no <EntryPoint> tag.", *note.asset_id());
 	case VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT:
-		return compose("The subtitle asset %1 has an <EntryPoint> other than 0.", note.note().get());
+		return compose("The subtitle asset %1 has an <EntryPoint> other than 0.", *note.asset_id());
 	case VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT:
-		return compose("The closed caption asset %1 has no <EntryPoint> tag.", note.note().get());
+		return compose("The closed caption asset %1 has no <EntryPoint> tag.", *note.asset_id());
 	case VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT:
-		return compose("The closed caption asset %1 has an <EntryPoint> other than 0.", note.note().get());
+		return compose("The closed caption asset %1 has an <EntryPoint> other than 0.", *note.asset_id());
 	case VerificationNote::Code::MISSING_HASH:
 		return compose("The asset %1 has no <Hash> tag in the CPL.", note.note().get());
 	case VerificationNote::Code::MISSING_FFEC_IN_FEATURE:
diff --git a/src/verify.h b/src/verify.h
index 334cea5c..ba726349 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -320,19 +320,19 @@ public:
 		/** If one reel has at least one _ClosedCaption_, all reels must have the same number of _ClosedCaptions_ */
 		MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS,
 		/** MainSubtitle in reels must have _<EntryPoint>_ [Bv2.1_8.3.2]
-		 *  note contains the asset ID
+		 *  asset_id contains the asset ID
 		 */
 		MISSING_SUBTITLE_ENTRY_POINT,
 		/** MainSubtitle _<EntryPoint>_ must be zero [Bv2.1_8.3.2]
-		 *  note contains the asset ID
+		 *  asset_id contains the asset ID
 		 */
 		INCORRECT_SUBTITLE_ENTRY_POINT,
 		/** Closed caption in reels must have _<EntryPoint>_ [Bv2.1_8.3.2]
-		 *  note contains the asset ID
+		 *  asset_id contains the asset ID
 		 */
 		MISSING_CLOSED_CAPTION_ENTRY_POINT,
 		/** Closed caption _MainSubtitle_ _<EntryPoint>_ must be zero [Bv2.1_8.3.2]
-		 *  note contains the asset ID
+		 *  asset_id contains the asset ID
 		 */
 		INCORRECT_CLOSED_CAPTION_ENTRY_POINT,
 		/** _<Hash>_ must be present for assets in CPLs
diff --git a/test/verify_test.cc b/test/verify_test.cc
index d9bc3e41..2b555ed3 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -3932,7 +3932,7 @@ verify_text_entry_point_check(dcp::TextType type, path dir, dcp::VerificationNot
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-			VN(code, subs->id()).set_cpl_id(cpl->id()).set_reel_index(0),
+			VN(code).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(subs->id()),
 			VN(VC::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id())
 		});
 }