INVALID_MAIN_SOUND_CONFIGURATION: note -> error.

4 files changed, 8 insertions, 9 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index 27481939..0bc333c2 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -328,9 +328,8 @@ CPL::read_composition_metadata_asset(cxml::ConstNodePtr node, vector<dcp::Verifi
 			notes->push_back(
 				dcp::VerificationNote(
 					dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION,
-					fmt::format("{} could not be parsed", _main_sound_configuration->as_string()),
 					*_file
-					).set_cpl_id(_id)
+					).set_cpl_id(_id).set_error(fmt::format("{} could not be parsed", _main_sound_configuration->as_string()))
 				);
 		}
 	}
diff --git a/src/verify.cc b/src/verify.cc
index 4cb21d31..bc3adea0 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1700,9 +1700,10 @@ verify_cpl(Context& context, shared_ptr<const CPL> cpl)
 		if (auto msc = cpl->main_sound_configuration()) {
 			if (msc->valid() && context.audio_channels && msc->channels() != *context.audio_channels) {
 				context.add_note(
-					VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION,
-					String::compose("MainSoundConfiguration has %1 channels but sound assets have %2", msc->channels(), *context.audio_channels),
-					cpl->file().get()
+					VerificationNote(
+						VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION,
+						cpl->file().get()
+					).set_error(fmt::format("MainSoundConfiguration has {} channels but sound assets have {}", msc->channels(), *context.audio_channels))
 				);
 			}
 		}
@@ -2189,7 +2190,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str
 	case VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS:
 		return compose("The sound assets do not all have the same channel count; the first to differ is %1", filename());
 	case VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION:
-		return compose("<MainSoundConfiguration> has an invalid value: %1", note.note().get());
+		return compose("<MainSoundConfiguration> has an invalid value: %1", *note.error());
 	case VerificationNote::Code::MISSING_FONT:
 		return compose("The font file for font ID \"%1\" was not found, or was not referred to in the ASSETMAP.", note.note().get());
 	case VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE:
diff --git a/src/verify.h b/src/verify.h
index 777a68de..ba485242 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -538,7 +538,7 @@ public:
 		 */
 		MISMATCHED_SOUND_CHANNEL_COUNTS,
 		/** The CPL contains a _<MainSoundConfiguration>_ tag which does not describe the number of channels in the audio assets, or which is in some way badly formatted
-		 *  note contains details of what is wrong
+		 *  error contains details of what is wrong
 		 *  file contains the CPL filename
 		 *  cpl_id contains the CPL ID
 		 */
diff --git a/test/verify_test.cc b/test/verify_test.cc
index a1462378..8f55feb7 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -5350,9 +5350,8 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_sound_configuration)
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			VN(
 				VC::INVALID_MAIN_SOUND_CONFIGURATION,
-				std::string{"MainSoundConfiguration has 6 channels but sound assets have 2"},
 				canonical(find_cpl(path))
-				).set_cpl_id(cpl->id())
+				).set_cpl_id(cpl->id()).set_error("MainSoundConfiguration has 6 channels but sound assets have 2"),
 		});
 }