Some more use of enum class.

13 files changed, 452 insertions, 454 deletions

diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc
index de69c211..1251d94f 100644
--- a/src/colour_conversion.cc
+++ b/src/colour_conversion.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -42,6 +42,7 @@
 #include <boost/numeric/ublas/io.hpp>
 
 using std::shared_ptr;
+using std::make_shared;
 using boost::optional;
 using namespace dcp;
 
@@ -49,14 +50,14 @@ ColourConversion const &
 ColourConversion::srgb_to_xyz ()
 {
 	static ColourConversion* c = new ColourConversion (
-		shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (2.4, 0.04045, 0.055, 12.92)),
-		YUV_TO_RGB_REC601,
+		make_shared<ModifiedGammaTransferFunction>(2.4, 0.04045, 0.055, 12.92),
+		YUVToRGB::REC601,
 		Chromaticity (0.64, 0.33),
 		Chromaticity (0.3, 0.6),
 		Chromaticity (0.15, 0.06),
 		Chromaticity::D65 (),
 		optional<Chromaticity> (),
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
+		make_shared<GammaTransferFunction>(2.6)
 		);
 	return *c;
 }
@@ -65,14 +66,14 @@ ColourConversion const &
 ColourConversion::rec601_to_xyz ()
 {
 	static ColourConversion* c = new ColourConversion (
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.2)),
-		YUV_TO_RGB_REC601,
+		make_shared<GammaTransferFunction>(2.2),
+		YUVToRGB::REC601,
 		Chromaticity (0.64, 0.33),
 		Chromaticity (0.3, 0.6),
 		Chromaticity (0.15, 0.06),
 		Chromaticity::D65 (),
 		optional<Chromaticity> (),
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
+		make_shared<GammaTransferFunction>(2.6)
 		);
 	return *c;
 }
@@ -81,14 +82,14 @@ ColourConversion const &
 ColourConversion::rec709_to_xyz ()
 {
 	static ColourConversion* c = new ColourConversion (
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.2)),
-		YUV_TO_RGB_REC709,
+		make_shared<GammaTransferFunction>(2.2),
+		YUVToRGB::REC709,
 		Chromaticity (0.64, 0.33),
 		Chromaticity (0.3, 0.6),
 		Chromaticity (0.15, 0.06),
 		Chromaticity::D65 (),
 		optional<Chromaticity> (),
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
+		make_shared<GammaTransferFunction>(2.6)
 		);
 	return *c;
 }
@@ -97,14 +98,14 @@ ColourConversion const &
 ColourConversion::p3_to_xyz ()
 {
 	static ColourConversion* c = new ColourConversion (
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6)),
-		YUV_TO_RGB_REC709,
+		make_shared<GammaTransferFunction>(2.6),
+		YUVToRGB::REC709,
 		Chromaticity (0.68, 0.32),
 		Chromaticity (0.265, 0.69),
 		Chromaticity (0.15, 0.06),
 		Chromaticity (0.314, 0.351),
 		optional<Chromaticity> (),
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
+		make_shared<GammaTransferFunction>(2.6)
 		);
 	return *c;
 }
@@ -116,14 +117,14 @@ ColourConversion::rec1886_to_xyz ()
 	   2.4 gamma, so here goes ...
 	*/
 	static ColourConversion* c = new ColourConversion (
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.4)),
-		YUV_TO_RGB_REC709,
+		make_shared<GammaTransferFunction>(2.4),
+		YUVToRGB::REC709,
 		Chromaticity (0.64, 0.33),
 		Chromaticity (0.3, 0.6),
 		Chromaticity (0.15, 0.06),
 		Chromaticity::D65 (),
 		optional<Chromaticity> (),
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
+		make_shared<GammaTransferFunction>(2.6)
 		);
 	return *c;
 }
@@ -132,14 +133,14 @@ ColourConversion const &
 ColourConversion::rec2020_to_xyz ()
 {
 	static ColourConversion* c = new ColourConversion (
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.4)),
-		YUV_TO_RGB_REC709,
+		make_shared<GammaTransferFunction>(2.4),
+		YUVToRGB::REC709,
 		Chromaticity (0.708, 0.292),
 		Chromaticity (0.170, 0.797),
 		Chromaticity (0.131, 0.046),
 		Chromaticity::D65 (),
 		optional<Chromaticity> (),
-		shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
+		make_shared<GammaTransferFunction>(2.6)
 		);
 	return *c;
 }
@@ -149,14 +150,14 @@ ColourConversion const &
 ColourConversion::s_gamut3_to_xyz ()
 {
 	static ColourConversion* c = new ColourConversion (
-		shared_ptr<const TransferFunction> (new SGamut3TransferFunction ()),
-		YUV_TO_RGB_REC709,
+		make_shared<SGamut3TransferFunction>(),
+		YUVToRGB::REC709,
 		Chromaticity (0.73, 0.280),
 		Chromaticity (0.140, 0.855),
 		Chromaticity (0.100, -0.050),
 		Chromaticity::D65 (),
 		optional<Chromaticity> (),
-		shared_ptr<const TransferFunction> (new IdentityTransferFunction ())
+		make_shared<IdentityTransferFunction>()
 		);
 	return *c;
 }
diff --git a/src/colour_conversion.h b/src/colour_conversion.h
index 17051bcd..d613c143 100644
--- a/src/colour_conversion.h
+++ b/src/colour_conversion.h
@@ -50,10 +50,10 @@ namespace dcp {
 
 class TransferFunction;
 
-enum YUVToRGB {
-	YUV_TO_RGB_REC601,
-	YUV_TO_RGB_REC709,
-	YUV_TO_RGB_COUNT
+enum class YUVToRGB {
+	REC601,
+	REC709,
+	COUNT
 };
 
 /** @class ColourConversion
@@ -64,7 +64,7 @@ class ColourConversion
 {
 public:
 	ColourConversion ()
-		: _yuv_to_rgb (YUV_TO_RGB_REC601)
+		: _yuv_to_rgb (YUVToRGB::REC601)
 	{}
 
 	ColourConversion (
diff --git a/src/dcp.cc b/src/dcp.cc
index d8c8c130..de02f8fb 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -192,14 +192,14 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 			   claims to come from ClipsterDCI 5.10.0.5.
 			*/
 			if (notes) {
-				notes->push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::EMPTY_ASSET_PATH});
+				notes->push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::EMPTY_ASSET_PATH});
 			}
 			continue;
 		}
 
 		if (!boost::filesystem::exists(path)) {
 			if (notes) {
-				notes->push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::MISSING_ASSET, path});
+				notes->push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_ASSET, path});
 			}
 			continue;
 		}
@@ -235,12 +235,12 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 			if (root == "CompositionPlaylist") {
 				auto cpl = make_shared<CPL>(path);
 				if (_standard && cpl->standard() && cpl->standard().get() != _standard.get() && notes) {
-					notes->push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_STANDARD});
+					notes->push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_STANDARD});
 				}
 				_cpls.push_back (cpl);
 			} else if (root == "DCSubtitle") {
 				if (_standard && _standard.get() == Standard::SMPTE && notes) {
-					notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_STANDARD));
+					notes->push_back (VerificationNote(VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_STANDARD));
 				}
 				other_assets.push_back (make_shared<InteropSubtitleAsset>(path));
 			}
@@ -268,7 +268,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 		for (auto i: cpls()) {
 			for (auto j: i->reel_mxfs()) {
 				if (!j->asset_ref().resolved() && paths.find(j->asset_ref().id()) == paths.end()) {
-					notes->push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::EXTERNAL_ASSET, j->asset_ref().id()));
+					notes->push_back (VerificationNote(VerificationNote::Type::WARNING, VerificationNote::Code::EXTERNAL_ASSET, j->asset_ref().id()));
 				}
 			}
 		}
diff --git a/src/language_tag.cc b/src/language_tag.cc
index 2b63bbf9..148e054b 100644
--- a/src/language_tag.cc
+++ b/src/language_tag.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -51,8 +51,6 @@ using boost::algorithm::trim;
 using namespace dcp;
 
 
-
-
 static vector<LanguageTag::SubtagData> language_list;
 static vector<LanguageTag::SubtagData> variant_list;
 static vector<LanguageTag::SubtagData> region_list;
@@ -60,7 +58,6 @@ static vector<LanguageTag::SubtagData> script_list;
 static vector<LanguageTag::SubtagData> extlang_list;
 
 
-
 static
 optional<LanguageTag::SubtagData>
 find_in_list (vector<LanguageTag::SubtagData> const& list, string subtag)
@@ -212,7 +209,7 @@ check_for_duplicates (vector<T> const& subtags, dcp::LanguageTag::SubtagType typ
 	vector<T> sorted = subtags;
 	sort (sorted.begin(), sorted.end());
 	optional<T> last;
-	BOOST_FOREACH (T const& i, sorted) {
+	for (auto const& i: sorted) {
 		if (last && i == *last) {
 			throw LanguageTagError (String::compose("Duplicate %1 subtag %2", dcp::LanguageTag::subtag_type_name(type), i.subtag()));
 		}
@@ -224,7 +221,7 @@ check_for_duplicates (vector<T> const& subtags, dcp::LanguageTag::SubtagType typ
 void
 LanguageTag::set_variants (vector<VariantSubtag> variants)
 {
-	check_for_duplicates (variants, VARIANT);
+	check_for_duplicates (variants, SubtagType::VARIANT);
 	_variants = variants;
 }
 
@@ -243,7 +240,7 @@ LanguageTag::add_extlang (ExtlangSubtag extlang)
 void
 LanguageTag::set_extlangs (vector<ExtlangSubtag> extlangs)
 {
-	check_for_duplicates (extlangs, EXTLANG);
+	check_for_duplicates (extlangs, SubtagType::EXTLANG);
 	_extlangs = extlangs;
 }
 
@@ -258,29 +255,29 @@ LanguageTag::description () const
 	string d;
 
 	BOOST_FOREACH (VariantSubtag const& i, _variants) {
-		optional<SubtagData> variant = get_subtag_data (VARIANT, i.subtag());
+		optional<SubtagData> variant = get_subtag_data (SubtagType::VARIANT, i.subtag());
 		DCP_ASSERT (variant);
 		d += variant->description + " dialect of ";
 	}
 
-	optional<SubtagData> language = get_subtag_data (LANGUAGE, _language->subtag());
+	optional<SubtagData> language = get_subtag_data (SubtagType::LANGUAGE, _language->subtag());
 	DCP_ASSERT (language);
 	d += language->description;
 
 	if (_script) {
-		optional<SubtagData> script = get_subtag_data (SCRIPT, _script->subtag());
+		optional<SubtagData> script = get_subtag_data (SubtagType::SCRIPT, _script->subtag());
 		DCP_ASSERT (script);
 		d += " written using the " + script->description + " script";
 	}
 
 	if (_region) {
-		optional<SubtagData> region = get_subtag_data (REGION, _region->subtag());
+		optional<SubtagData> region = get_subtag_data (SubtagType::REGION, _region->subtag());
 		DCP_ASSERT (region);
 		d += " for " + region->description;
 	}
 
 	BOOST_FOREACH (ExtlangSubtag const& i, _extlangs) {
-		optional<SubtagData> extlang = get_subtag_data (EXTLANG, i.subtag());
+		optional<SubtagData> extlang = get_subtag_data (SubtagType::EXTLANG, i.subtag());
 		DCP_ASSERT (extlang);
 		d += ", " + extlang->description;
 	}
@@ -293,15 +290,15 @@ vector<LanguageTag::SubtagData> const &
 LanguageTag::get_all (SubtagType type)
 {
 	switch (type) {
-	case LANGUAGE:
+	case SubtagType::LANGUAGE:
 		return language_list;
-	case SCRIPT:
+	case SubtagType::SCRIPT:
 		return script_list;
-	case REGION:
+	case SubtagType::REGION:
 		return region_list;
-	case VARIANT:
+	case SubtagType::VARIANT:
 		return variant_list;
-	case EXTLANG:
+	case SubtagType::EXTLANG:
 		return extlang_list;
 	}
 
@@ -313,15 +310,15 @@ string
 LanguageTag::subtag_type_name (SubtagType type)
 {
 	switch (type) {
-		case LANGUAGE:
+		case SubtagType::LANGUAGE:
 			return "Language";
-		case SCRIPT:
+		case SubtagType::SCRIPT:
 			return "Script";
-		case REGION:
+		case SubtagType::REGION:
 			return "Region";
-		case VARIANT:
+		case SubtagType::VARIANT:
 			return "Variant";
-		case EXTLANG:
+		case SubtagType::EXTLANG:
 			return "Extended";
 	}
 
@@ -377,23 +374,23 @@ LanguageTag::subtags () const
 	vector<pair<SubtagType, SubtagData> > s;
 
 	if (_language) {
-		s.push_back (make_pair(LANGUAGE, *get_subtag_data(LANGUAGE, _language->subtag())));
+		s.push_back (make_pair(SubtagType::LANGUAGE, *get_subtag_data(SubtagType::LANGUAGE, _language->subtag())));
 	}
 
 	if (_script) {
-		s.push_back (make_pair(SCRIPT, *get_subtag_data(SCRIPT, _script->subtag())));
+		s.push_back (make_pair(SubtagType::SCRIPT, *get_subtag_data(SubtagType::SCRIPT, _script->subtag())));
 	}
 
 	if (_region) {
-		s.push_back (make_pair(REGION, *get_subtag_data(REGION, _region->subtag())));
+		s.push_back (make_pair(SubtagType::REGION, *get_subtag_data(SubtagType::REGION, _region->subtag())));
 	}
 
 	BOOST_FOREACH (VariantSubtag const& i, _variants) {
-		s.push_back (make_pair(VARIANT, *get_subtag_data(VARIANT, i.subtag())));
+		s.push_back (make_pair(SubtagType::VARIANT, *get_subtag_data(SubtagType::VARIANT, i.subtag())));
 	}
 
 	BOOST_FOREACH (ExtlangSubtag const& i, _extlangs) {
-		s.push_back (make_pair(EXTLANG, *get_subtag_data(EXTLANG, i.subtag())));
+		s.push_back (make_pair(SubtagType::EXTLANG, *get_subtag_data(SubtagType::EXTLANG, i.subtag())));
 	}
 
 	return s;
@@ -404,15 +401,15 @@ optional<LanguageTag::SubtagData>
 LanguageTag::get_subtag_data (LanguageTag::SubtagType type, string subtag)
 {
 	switch (type) {
-	case dcp::LanguageTag::LANGUAGE:
+	case SubtagType::LANGUAGE:
 		return find_in_list(language_list, subtag);
-	case dcp::LanguageTag::SCRIPT:
+	case SubtagType::SCRIPT:
 		return find_in_list(script_list, subtag);
-	case dcp::LanguageTag::REGION:
+	case SubtagType::REGION:
 		return find_in_list(region_list, subtag);
-	case dcp::LanguageTag::VARIANT:
+	case SubtagType::VARIANT:
 		return find_in_list(variant_list, subtag);
-	case dcp::LanguageTag::EXTLANG:
+	case SubtagType::EXTLANG:
 		return find_in_list(extlang_list, subtag);
 	}
 
diff --git a/src/language_tag.h b/src/language_tag.h
index a0beaad0..06134b03 100644
--- a/src/language_tag.h
+++ b/src/language_tag.h
@@ -67,7 +67,7 @@ public:
 		}
 	};
 
-	enum SubtagType
+	enum class SubtagType
 	{
 		LANGUAGE,
 		SCRIPT,
@@ -102,12 +102,12 @@ public:
 	{
 	public:
 		LanguageSubtag (std::string subtag)
-			: Subtag(subtag, LANGUAGE) {}
+			: Subtag(subtag, SubtagType::LANGUAGE) {}
 		LanguageSubtag (char const* subtag)
-			: Subtag(subtag, LANGUAGE) {}
+			: Subtag(subtag, SubtagType::LANGUAGE) {}
 
 		SubtagType type () const {
-			return LANGUAGE;
+			return SubtagType::LANGUAGE;
 		}
 	};
 
@@ -115,12 +115,12 @@ public:
 	{
 	public:
 		ScriptSubtag (std::string subtag)
-			: Subtag(subtag, SCRIPT) {}
+			: Subtag(subtag, SubtagType::SCRIPT) {}
 		ScriptSubtag (char const* subtag)
-			: Subtag(subtag, SCRIPT) {}
+			: Subtag(subtag, SubtagType::SCRIPT) {}
 
 		SubtagType type () const {
-			return SCRIPT;
+			return SubtagType::SCRIPT;
 		}
 	};
 
@@ -128,12 +128,12 @@ public:
 	{
 	public:
 		RegionSubtag (std::string subtag)
-			: Subtag(subtag, REGION) {}
+			: Subtag(subtag, SubtagType::REGION) {}
 		RegionSubtag (char const* subtag)
-			: Subtag(subtag, REGION) {}
+			: Subtag(subtag, SubtagType::REGION) {}
 
 		SubtagType type () const {
-			return REGION;
+			return SubtagType::REGION;
 		}
 	};
 
@@ -141,12 +141,12 @@ public:
 	{
 	public:
 		VariantSubtag (std::string subtag)
-			: Subtag(subtag, VARIANT) {}
+			: Subtag(subtag, SubtagType::VARIANT) {}
 		VariantSubtag (char const* subtag)
-			: Subtag(subtag, VARIANT) {}
+			: Subtag(subtag, SubtagType::VARIANT) {}
 
 		SubtagType type () const {
-			return VARIANT;
+			return SubtagType::VARIANT;
 		}
 
 		bool operator== (VariantSubtag const& other) const;
@@ -158,12 +158,12 @@ public:
 	{
 	public:
 		ExtlangSubtag (std::string subtag)
-			: Subtag(subtag, EXTLANG) {}
+			: Subtag(subtag, SubtagType::EXTLANG) {}
 		ExtlangSubtag (char const* subtag)
-			: Subtag(subtag, EXTLANG) {}
+			: Subtag(subtag, SubtagType::EXTLANG) {}
 
 		SubtagType type () const {
-			return EXTLANG;
+			return SubtagType::EXTLANG;
 		}
 
 		bool operator== (ExtlangSubtag const& other) const;
@@ -205,13 +205,13 @@ public:
 	void set_extlangs (std::vector<ExtlangSubtag> extlangs);
 	void add_extlang (ExtlangSubtag extlang);
 
-	std::vector<std::pair<SubtagType, SubtagData> > subtags () const;
+	std::vector<std::pair<SubtagType, SubtagData>> subtags () const;
 
 	static std::vector<SubtagData> const& get_all (SubtagType type);
 	static std::string subtag_type_name (SubtagType type);
 
 	static boost::optional<std::string> get_subtag_description (SubtagType, std::string subtag);
-	static boost::optional<SubtagData > get_subtag_data (SubtagType, std::string subtag);
+	static boost::optional<SubtagData> get_subtag_data (SubtagType, std::string subtag);
 
 	template <class T>
 	static boost::optional<std::string> get_subtag_description (T s) {
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 37b381ae..9d46cb5c 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -203,7 +203,7 @@ SubtitleAsset::text_node_state (xmlpp::Element const * node) const
 		ps.direction = string_to_direction (d.get ());
 	}
 
-	ps.type = ParseState::TEXT;
+	ps.type = ParseState::Type::TEXT;
 
 	return ps;
 }
@@ -215,7 +215,7 @@ SubtitleAsset::image_node_state (xmlpp::Element const * node) const
 
 	position_align (ps, node);
 
-	ps.type = ParseState::IMAGE;
+	ps.type = ParseState::Type::IMAGE;
 
 	return ps;
 }
@@ -360,7 +360,7 @@ SubtitleAsset::maybe_add_subtitle (string text, vector<ParseState> const & parse
 	DCP_ASSERT (ps.type);
 
 	switch (ps.type.get()) {
-	case ParseState::TEXT:
+	case ParseState::Type::TEXT:
 		_subtitles.push_back (
 			shared_ptr<Subtitle> (
 				new SubtitleString (
@@ -387,7 +387,7 @@ SubtitleAsset::maybe_add_subtitle (string text, vector<ParseState> const & parse
 				)
 			);
 		break;
-	case ParseState::IMAGE:
+	case ParseState::Type::IMAGE:
 		/* Add a subtitle with no image data and we'll fill that in later */
 		_subtitles.push_back (
 			shared_ptr<Subtitle> (
@@ -465,7 +465,7 @@ Time
 SubtitleAsset::latest_subtitle_out () const
 {
 	Time t;
-	BOOST_FOREACH (shared_ptr<Subtitle> i, _subtitles) {
+	for (auto i: _subtitles) {
 		if (i->out() > t) {
 			t = i->out ();
 		}
@@ -481,7 +481,7 @@ SubtitleAsset::equals (shared_ptr<const Asset> other_asset, EqualityOptions opti
 		return false;
 	}
 
-	shared_ptr<const SubtitleAsset> other = dynamic_pointer_cast<const SubtitleAsset> (other_asset);
+	auto other = dynamic_pointer_cast<const SubtitleAsset> (other_asset);
 	if (!other) {
 		return false;
 	}
@@ -539,7 +539,7 @@ SubtitleAsset::pull_fonts (shared_ptr<order::Part> part)
 	}
 
 	/* Pull up from children */
-	BOOST_FOREACH (shared_ptr<order::Part> i, part->children) {
+	for (auto i: part->children) {
 		pull_fonts (i);
 	}
 
@@ -597,14 +597,14 @@ SubtitleAsset::pull_fonts (shared_ptr<order::Part> part)
 void
 SubtitleAsset::subtitles_as_xml (xmlpp::Element* xml_root, int time_code_rate, Standard standard) const
 {
-	vector<shared_ptr<Subtitle> > sorted = _subtitles;
+	auto sorted = _subtitles;
 	std::stable_sort(sorted.begin(), sorted.end(), SubtitleSorter());
 
 	/* Gather our subtitles into a hierarchy of Subtitle/Text/String objects, writing
 	   font information into the bottom level (String) objects.
 	*/
 
-	shared_ptr<order::Part> root (new order::Part (shared_ptr<order::Part> ()));
+	auto root = make_shared<order::Part>(shared_ptr<order::Part>());
 	shared_ptr<order::Subtitle> subtitle;
 	shared_ptr<order::Text> text;
 
@@ -618,7 +618,7 @@ SubtitleAsset::subtitles_as_xml (xmlpp::Element* xml_root, int time_code_rate, S
 	float last_v_position;
 	Direction last_direction;
 
-	BOOST_FOREACH (shared_ptr<Subtitle> i, sorted) {
+	for (auto i: sorted) {
 		if (!subtitle ||
 		    (last_in != i->in() ||
 		     last_out != i->out() ||
@@ -626,7 +626,7 @@ SubtitleAsset::subtitles_as_xml (xmlpp::Element* xml_root, int time_code_rate, S
 		     last_fade_down_time != i->fade_down_time())
 			) {
 
-			subtitle.reset (new order::Subtitle (root, i->in(), i->out(), i->fade_up_time(), i->fade_down_time()));
+			subtitle = make_shared<order::Subtitle>(root, i->in(), i->out(), i->fade_up_time(), i->fade_down_time());
 			root->children.push_back (subtitle);
 
 			last_in = i->in ();
@@ -636,7 +636,7 @@ SubtitleAsset::subtitles_as_xml (xmlpp::Element* xml_root, int time_code_rate, S
 			text.reset ();
 		}
 
-		shared_ptr<SubtitleString> is = dynamic_pointer_cast<SubtitleString>(i);
+		auto is = dynamic_pointer_cast<SubtitleString>(i);
 		if (is) {
 			if (!text ||
 			    last_h_align != is->h_align() ||
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 02976f7d..7502ad33 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -136,7 +136,7 @@ protected:
 		boost::optional<Time> out;
 		boost::optional<Time> fade_up_time;
 		boost::optional<Time> fade_down_time;
-		enum Type {
+		enum class Type {
 			TEXT,
 			IMAGE
 		};
diff --git a/src/verify.cc b/src/verify.cc
index 0696541f..fe071b48 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -344,8 +344,8 @@ validate_xml (T xml, boost::filesystem::path xsd_dtd_directory, vector<Verificat
 
 	for (auto i: error_handler.errors()) {
 		notes.push_back ({
-			VerificationNote::VERIFY_ERROR,
-			VerificationNote::INVALID_XML,
+			VerificationNote::Type::ERROR,
+			VerificationNote::Code::INVALID_XML,
 			i.message(),
 			boost::trim_copy(i.public_id() + " " + i.system_id()),
 			i.line()
@@ -354,10 +354,10 @@ validate_xml (T xml, boost::filesystem::path xsd_dtd_directory, vector<Verificat
 }
 
 
-enum VerifyAssetResult {
-	VERIFY_ASSET_RESULT_GOOD,
-	VERIFY_ASSET_RESULT_CPL_PKL_DIFFER,
-	VERIFY_ASSET_RESULT_BAD
+enum class VerifyAssetResult {
+	GOOD,
+	CPL_PKL_DIFFER,
+	BAD
 };
 
 
@@ -384,14 +384,14 @@ verify_asset (shared_ptr<const DCP> dcp, shared_ptr<const ReelMXF> reel_mxf, fun
 
 	auto cpl_hash = reel_mxf->hash();
 	if (cpl_hash && *cpl_hash != *pkl_hash) {
-		return VERIFY_ASSET_RESULT_CPL_PKL_DIFFER;
+		return VerifyAssetResult::CPL_PKL_DIFFER;
 	}
 
 	if (actual_hash != *pkl_hash) {
-		return VERIFY_ASSET_RESULT_BAD;
+		return VerifyAssetResult::BAD;
 	}
 
-	return VERIFY_ASSET_RESULT_GOOD;
+	return VerifyAssetResult::GOOD;
 }
 
 
@@ -401,16 +401,16 @@ verify_language_tag (string tag, vector<VerificationNote>& notes)
 	try {
 		LanguageTag test (tag);
 	} catch (LanguageTagError &) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_LANGUAGE, tag});
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_LANGUAGE, tag});
 	}
 }
 
 
-enum VerifyPictureAssetResult
+enum class VerifyPictureAssetResult
 {
-	VERIFY_PICTURE_ASSET_RESULT_GOOD,
-	VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_LARGE,
-	VERIFY_PICTURE_ASSET_RESULT_BAD,
+	GOOD,
+	FRAME_NEARLY_TOO_LARGE,
+	BAD,
 };
 
 
@@ -448,12 +448,12 @@ verify_picture_asset_type (shared_ptr<const ReelMXF> reel_mxf, function<void (fl
 	static const int max_frame =   rint(250 * 1000000 / (8 * asset->edit_rate().as_float()));
 	static const int risky_frame = rint(230 * 1000000 / (8 * asset->edit_rate().as_float()));
 	if (biggest_frame > max_frame) {
-		return VERIFY_PICTURE_ASSET_RESULT_BAD;
+		return VerifyPictureAssetResult::BAD;
 	} else if (biggest_frame > risky_frame) {
-		return VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_LARGE;
+		return VerifyPictureAssetResult::FRAME_NEARLY_TOO_LARGE;
 	}
 
-	return VERIFY_PICTURE_ASSET_RESULT_GOOD;
+	return VerifyPictureAssetResult::GOOD;
 }
 
 
@@ -484,14 +484,14 @@ verify_main_picture_asset (
 	stage ("Checking picture asset hash", file);
 	auto const r = verify_asset (dcp, reel_asset, progress);
 	switch (r) {
-		case VERIFY_ASSET_RESULT_BAD:
+		case VerifyAssetResult::BAD:
 			notes.push_back ({
-				VerificationNote::VERIFY_ERROR, VerificationNote::INCORRECT_PICTURE_HASH, file
+				VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_PICTURE_HASH, file
 			});
 			break;
-		case VERIFY_ASSET_RESULT_CPL_PKL_DIFFER:
+		case VerifyAssetResult::CPL_PKL_DIFFER:
 			notes.push_back ({
-				VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_PICTURE_HASHES, file
+				VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_PICTURE_HASHES, file
 			});
 			break;
 		default:
@@ -500,14 +500,14 @@ verify_main_picture_asset (
 	stage ("Checking picture frame sizes", asset->file());
 	auto const pr = verify_picture_asset (reel_asset, progress);
 	switch (pr) {
-		case VERIFY_PICTURE_ASSET_RESULT_BAD:
+		case VerifyPictureAssetResult::BAD:
 			notes.push_back ({
-				VerificationNote::VERIFY_ERROR, VerificationNote::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
+				VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
 			});
 			break;
-		case VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_LARGE:
+		case VerifyPictureAssetResult::FRAME_NEARLY_TOO_LARGE:
 			notes.push_back ({
-				VerificationNote::VERIFY_WARNING, VerificationNote::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
+				VerificationNote::Type::WARNING, VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, file
 			});
 			break;
 		default:
@@ -521,8 +521,8 @@ verify_main_picture_asset (
 		asset->size() != Size(4096, 1716) &&
 		asset->size() != Size(3996, 2160)) {
 		notes.push_back({
-			VerificationNote::VERIFY_BV21_ERROR,
-			VerificationNote::INVALID_PICTURE_SIZE_IN_PIXELS,
+			VerificationNote::Type::BV21_ERROR,
+			VerificationNote::Code::INVALID_PICTURE_SIZE_IN_PIXELS,
 			String::compose("%1x%2", asset->size().width, asset->size().height),
 			file
 		});
@@ -534,8 +534,8 @@ verify_main_picture_asset (
 		(asset->edit_rate() != Fraction(24, 1) && asset->edit_rate() != Fraction(25, 1) && asset->edit_rate() != Fraction(48, 1))
 	   ) {
 		notes.push_back({
-			VerificationNote::VERIFY_BV21_ERROR,
-			VerificationNote::INVALID_PICTURE_FRAME_RATE_FOR_2K,
+			VerificationNote::Type::BV21_ERROR,
+			VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K,
 			String::compose("%1/%2", asset->edit_rate().numerator, asset->edit_rate().denominator),
 			file
 		});
@@ -545,8 +545,8 @@ verify_main_picture_asset (
 		/* Only 24fps allowed for 4K */
 		if (asset->edit_rate() != Fraction(24, 1)) {
 			notes.push_back({
-				VerificationNote::VERIFY_BV21_ERROR,
-				VerificationNote::INVALID_PICTURE_FRAME_RATE_FOR_4K,
+				VerificationNote::Type::BV21_ERROR,
+				VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_4K,
 				String::compose("%1/%2", asset->edit_rate().numerator, asset->edit_rate().denominator),
 				file
 			});
@@ -555,8 +555,8 @@ verify_main_picture_asset (
 		/* Only 2D allowed for 4K */
 		if (dynamic_pointer_cast<const StereoPictureAsset>(asset)) {
 			notes.push_back({
-				VerificationNote::VERIFY_BV21_ERROR,
-				VerificationNote::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D,
+				VerificationNote::Type::BV21_ERROR,
+				VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D,
 				String::compose("%1/%2", asset->edit_rate().numerator, asset->edit_rate().denominator),
 				file
 			});
@@ -580,11 +580,11 @@ verify_main_sound_asset (
 	stage ("Checking sound asset hash", asset->file());
 	auto const r = verify_asset (dcp, reel_asset, progress);
 	switch (r) {
-		case VERIFY_ASSET_RESULT_BAD:
-			notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::INCORRECT_SOUND_HASH, *asset->file()});
+		case VerifyAssetResult::BAD:
+			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_SOUND_HASH, *asset->file()});
 			break;
-		case VERIFY_ASSET_RESULT_CPL_PKL_DIFFER:
-			notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_SOUND_HASHES, *asset->file()});
+		case VerifyAssetResult::CPL_PKL_DIFFER:
+			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_SOUND_HASHES, *asset->file()});
 			break;
 		default:
 			break;
@@ -594,7 +594,7 @@ verify_main_sound_asset (
 
 	verify_language_tag (asset->language(), notes);
 	if (asset->sampling_rate() != 48000) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_SOUND_FRAME_RATE, raw_convert<string>(asset->sampling_rate()), *asset->file()});
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_SOUND_FRAME_RATE, raw_convert<string>(asset->sampling_rate()), *asset->file()});
 	}
 }
 
@@ -608,9 +608,9 @@ verify_main_subtitle_reel (shared_ptr<const ReelSubtitleAsset> reel_asset, vecto
 	}
 
 	if (!reel_asset->entry_point()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_SUBTITLE_ENTRY_POINT, reel_asset->id() });
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT, reel_asset->id() });
 	} else if (reel_asset->entry_point().get()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INCORRECT_SUBTITLE_ENTRY_POINT, reel_asset->id() });
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT, reel_asset->id() });
 	}
 }
 
@@ -624,9 +624,9 @@ verify_closed_caption_reel (shared_ptr<const ReelClosedCaptionAsset> reel_asset,
 	}
 
 	if (!reel_asset->entry_point()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CLOSED_CAPTION_ENTRY_POINT, reel_asset->id() });
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT, reel_asset->id() });
 	} else if (reel_asset->entry_point().get()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INCORRECT_CLOSED_CAPTION_ENTRY_POINT, reel_asset->id() });
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT, reel_asset->id() });
 	}
 }
 
@@ -651,15 +651,15 @@ verify_smpte_subtitle_asset (
 		if (!state.subtitle_language) {
 			state.subtitle_language = language;
 		} else if (state.subtitle_language != language) {
-			notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISMATCHED_SUBTITLE_LANGUAGES });
+			notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES });
 		}
 	} else {
-		notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_SUBTITLE_LANGUAGE, *asset->file() });
+		notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, *asset->file() });
 	}
 	auto const size = boost::filesystem::file_size(asset->file().get());
 	if (size > 115 * 1024 * 1024) {
 		notes.push_back (
-			{ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_TIMED_TEXT_SIZE_IN_BYTES, raw_convert<string>(size), *asset->file() }
+			{ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, raw_convert<string>(size), *asset->file() }
 			);
 	}
 	/* XXX: I'm not sure what Bv2.1_7.2.1 means when it says "the font resource shall not be larger than 10MB"
@@ -671,13 +671,13 @@ verify_smpte_subtitle_asset (
 		total_size += i.second.size();
 	}
 	if (total_size > 10 * 1024 * 1024) {
-		notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, raw_convert<string>(total_size), asset->file().get() });
+		notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, raw_convert<string>(total_size), asset->file().get() });
 	}
 
 	if (!asset->start_time()) {
-		notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_SUBTITLE_START_TIME, asset->file().get() });
+		notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_SUBTITLE_START_TIME, asset->file().get() });
 	} else if (asset->start_time() != Time()) {
-		notes.push_back ({ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_SUBTITLE_START_TIME, asset->file().get() });
+		notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_SUBTITLE_START_TIME, asset->file().get() });
 	}
 }
 
@@ -716,7 +716,7 @@ verify_closed_caption_asset (
 	verify_subtitle_asset (asset, stage, xsd_dtd_directory, notes, state);
 
 	if (asset->raw_xml().size() > 256 * 1024) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES, raw_convert<string>(asset->raw_xml().size()), *asset->file()});
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES, raw_convert<string>(asset->raw_xml().size()), *asset->file()});
 	}
 }
 
@@ -785,19 +785,19 @@ verify_text_timing (
 
 	if (too_early) {
 		notes.push_back({
-			VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME
+			VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
 		});
 	}
 
 	if (too_short) {
 		notes.push_back ({
-			VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_DURATION
+			VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_DURATION
 		});
 	}
 
 	if (too_close) {
 		notes.push_back ({
-			VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_SPACING
+			VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_SPACING
 		});
 	}
 }
@@ -996,9 +996,9 @@ verify_extension_metadata (shared_ptr<CPL> cpl, vector<VerificationNote>& notes)
 	}
 
 	if (missing) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get()});
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get()});
 	} else if (!malformed.empty()) {
-		notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_EXTENSION_METADATA, malformed, cpl->file().get()});
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_EXTENSION_METADATA, malformed, cpl->file().get()});
 	}
 }
 
@@ -1056,17 +1056,17 @@ dcp::verify (
 		try {
 			dcp->read (&notes);
 		} catch (ReadError& e) {
-			notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::FAILED_READ, string(e.what())});
+			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
 		} catch (XMLError& e) {
-			notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::FAILED_READ, string(e.what())});
+			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
 		} catch (MXFFileError& e) {
-			notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::FAILED_READ, string(e.what())});
+			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
 		} catch (cxml::Error& e) {
-			notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::FAILED_READ, string(e.what())});
+			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
 		}
 
 		if (dcp->standard() != Standard::SMPTE) {
-			notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_STANDARD});
+			notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_STANDARD});
 		}
 
 		for (auto cpl: dcp->cpls()) {
@@ -1074,7 +1074,7 @@ dcp::verify (
 			validate_xml (cpl->file().get(), xsd_dtd_directory, notes);
 
 			if (cpl->any_encrypted() && !cpl->all_encrypted()) {
-				notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::PARTIALLY_ENCRYPTED});
+				notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::PARTIALLY_ENCRYPTED});
 			}
 
 			for (auto const& i: cpl->additional_subtitle_languages()) {
@@ -1089,7 +1089,7 @@ dcp::verify (
 						LanguageTag::RegionSubtag test (terr);
 					} catch (...) {
 						if (terr != "001") {
-							notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_LANGUAGE, terr});
+							notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_LANGUAGE, terr});
 						}
 					}
 				}
@@ -1097,9 +1097,9 @@ dcp::verify (
 
 			if (dcp->standard() == Standard::SMPTE) {
 				if (!cpl->annotation_text()) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
 				} else if (cpl->annotation_text().get() != cpl->content_title_text()) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
+					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
 				}
 			}
 
@@ -1107,7 +1107,7 @@ dcp::verify (
 				/* Check that the CPL's hash corresponds to the PKL */
 				optional<string> h = i->hash(cpl->id());
 				if (h && make_digest(ArrayData(*cpl->file())) != *h) {
-					notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()});
+					notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()});
 				}
 
 				/* Check that any PKL with a single CPL has its AnnotationText the same as the CPL's ContentTitleText */
@@ -1128,7 +1128,7 @@ dcp::verify (
 				}
 
 				if (required_annotation_text && i->annotation_text() != required_annotation_text) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, i->id(), i->file().get()});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, i->id(), i->file().get()});
 				}
 			}
 
@@ -1147,14 +1147,14 @@ dcp::verify (
 
 				for (auto i: reel->assets()) {
 					if (i->duration() && (i->duration().get() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
-						notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::INVALID_DURATION, i->id()});
+						notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_DURATION, i->id()});
 					}
 					if ((i->intrinsic_duration() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
-						notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::INVALID_INTRINSIC_DURATION, i->id()});
+						notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_INTRINSIC_DURATION, i->id()});
 					}
 					auto mxf = dynamic_pointer_cast<ReelMXF>(i);
 					if (mxf && !mxf->hash()) {
-						notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_HASH, i->id()});
+						notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_HASH, i->id()});
 					}
 				}
 
@@ -1164,7 +1164,7 @@ dcp::verify (
 						if (!duration) {
 							duration = i->actual_duration();
 						} else if (*duration != i->actual_duration()) {
-							notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISMATCHED_ASSET_DURATION});
+							notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_ASSET_DURATION});
 							break;
 						}
 					}
@@ -1182,8 +1182,8 @@ dcp::verify (
 					     frame_rate.numerator != 60 &&
 					     frame_rate.numerator != 96)) {
 						notes.push_back ({
-							VerificationNote::VERIFY_ERROR,
-							VerificationNote::INVALID_PICTURE_FRAME_RATE,
+							VerificationNote::Type::ERROR,
+							VerificationNote::Code::INVALID_PICTURE_FRAME_RATE,
 							String::compose("%1/%2", frame_rate.numerator, frame_rate.denominator)
 						});
 					}
@@ -1227,36 +1227,36 @@ dcp::verify (
 			if (dcp->standard() == Standard::SMPTE) {
 
 				if (have_main_subtitle && have_no_main_subtitle) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS});
 				}
 
 				if (fewest_closed_captions != most_closed_captions) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS});
 				}
 
 				if (cpl->content_kind() == ContentKind::FEATURE) {
 					if (markers_seen.find(Marker::FFEC) == markers_seen.end()) {
-						notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_FFEC_IN_FEATURE});
+						notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_FFEC_IN_FEATURE});
 					}
 					if (markers_seen.find(Marker::FFMC) == markers_seen.end()) {
-						notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_FFMC_IN_FEATURE});
+						notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_FFMC_IN_FEATURE});
 					}
 				}
 
 				auto ffoc = markers_seen.find(Marker::FFOC);
 				if (ffoc == markers_seen.end()) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::MISSING_FFOC});
+					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSING_FFOC});
 				} else if (ffoc->second.e != 1) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INCORRECT_FFOC, raw_convert<string>(ffoc->second.e)});
+					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_FFOC, raw_convert<string>(ffoc->second.e)});
 				}
 
 				auto lfoc = markers_seen.find(Marker::LFOC);
 				if (lfoc == markers_seen.end()) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::MISSING_LFOC});
+					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSING_LFOC});
 				} else {
 					auto lfoc_time = lfoc->second.as_editable_units(lfoc->second.tcr);
 					if (lfoc_time != (cpl->reels().back()->duration() - 1)) {
-						notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INCORRECT_LFOC, raw_convert<string>(lfoc_time)});
+						notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_LFOC, raw_convert<string>(lfoc_time)});
 					}
 				}
 
@@ -1270,12 +1270,12 @@ dcp::verify (
 				}
 
 				if (result.line_count_exceeded) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_LINE_COUNT});
+					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT});
 				}
 				if (result.error_length_exceeded) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::INVALID_SUBTITLE_LINE_LENGTH});
+					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH});
 				} else if (result.warning_length_exceeded) {
-					notes.push_back ({VerificationNote::VERIFY_WARNING, VerificationNote::NEARLY_INVALID_SUBTITLE_LINE_LENGTH});
+					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH});
 				}
 
 				result = LinesCharactersResult();
@@ -1288,19 +1288,19 @@ dcp::verify (
 				}
 
 				if (result.line_count_exceeded) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_LINE_COUNT});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT});
 				}
 				if (result.error_length_exceeded) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::INVALID_CLOSED_CAPTION_LINE_LENGTH});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH});
 				}
 
 				if (!cpl->full_content_title_text()) {
 					/* Since FullContentTitleText is assumed always to exist if there's a CompositionMetadataAsset we
 					 * can use it as a proxy for CompositionMetadataAsset's existence.
 					 */
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get()});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get()});
 				} else if (!cpl->version_number()) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get()});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get()});
 				}
 
 				verify_extension_metadata (cpl, notes);
@@ -1310,7 +1310,7 @@ dcp::verify (
 					DCP_ASSERT (cpl->file());
 					doc.read_file (cpl->file().get());
 					if (!doc.optional_node_child("Signature")) {
-						notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl->id(), cpl->file().get()});
+						notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl->id(), cpl->file().get()});
 					}
 				}
 			}
@@ -1323,7 +1323,7 @@ dcp::verify (
 				cxml::Document doc ("PackingList");
 				doc.read_file (pkl->file().get());
 				if (!doc.optional_node_child("Signature")) {
-					notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl->id(), pkl->file().get()});
+					notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl->id(), pkl->file().get()});
 				}
 			}
 		}
@@ -1332,7 +1332,7 @@ dcp::verify (
 			stage ("Checking ASSETMAP", dcp->asset_map_path().get());
 			validate_xml (dcp->asset_map_path().get(), xsd_dtd_directory, notes);
 		} else {
-			notes.push_back ({VerificationNote::VERIFY_ERROR, VerificationNote::MISSING_ASSETMAP});
+			notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_ASSETMAP});
 		}
 	}
 
@@ -1353,131 +1353,131 @@ dcp::note_to_string (VerificationNote note)
 	 *  Messages should not mention whether or not their errors are a part of Bv2.1.
 	 */
 	switch (note.code()) {
-	case VerificationNote::FAILED_READ:
+	case VerificationNote::Code::FAILED_READ:
 		return *note.note();
-	case VerificationNote::MISMATCHED_CPL_HASHES:
+	case VerificationNote::Code::MISMATCHED_CPL_HASHES:
 		return String::compose("The hash of the CPL %1 in the PKL does not agree with the CPL file.", note.note().get());
-	case VerificationNote::INVALID_PICTURE_FRAME_RATE:
+	case VerificationNote::Code::INVALID_PICTURE_FRAME_RATE:
 		return String::compose("The picture in a reel has an invalid frame rate %1.", note.note().get());
-	case VerificationNote::INCORRECT_PICTURE_HASH:
+	case VerificationNote::Code::INCORRECT_PICTURE_HASH:
 		return String::compose("The hash of the picture asset %1 does not agree with the PKL file.", note.file()->filename());
-	case VerificationNote::MISMATCHED_PICTURE_HASHES:
+	case VerificationNote::Code::MISMATCHED_PICTURE_HASHES:
 		return String::compose("The PKL and CPL hashes differ for the picture asset %1.", note.file()->filename());
-	case VerificationNote::INCORRECT_SOUND_HASH:
+	case VerificationNote::Code::INCORRECT_SOUND_HASH:
 		return String::compose("The hash of the sound asset %1 does not agree with the PKL file.", note.file()->filename());
-	case VerificationNote::MISMATCHED_SOUND_HASHES:
+	case VerificationNote::Code::MISMATCHED_SOUND_HASHES:
 		return String::compose("The PKL and CPL hashes differ for the sound asset %1.", note.file()->filename());
-	case VerificationNote::EMPTY_ASSET_PATH:
+	case VerificationNote::Code::EMPTY_ASSET_PATH:
 		return "The asset map contains an empty asset path.";
-	case VerificationNote::MISSING_ASSET:
+	case VerificationNote::Code::MISSING_ASSET:
 		return String::compose("The file %1 for an asset in the asset map cannot be found.", note.file()->filename());
-	case VerificationNote::MISMATCHED_STANDARD:
+	case VerificationNote::Code::MISMATCHED_STANDARD:
 		return "The DCP contains both SMPTE and Interop parts.";
-	case VerificationNote::INVALID_XML:
+	case VerificationNote::Code::INVALID_XML:
 		return String::compose("An XML file is badly formed: %1 (%2:%3)", note.note().get(), note.file()->filename(), note.line().get());
-	case VerificationNote::MISSING_ASSETMAP:
+	case VerificationNote::Code::MISSING_ASSETMAP:
 		return "No ASSETMAP or ASSETMAP.xml was found.";
-	case VerificationNote::INVALID_INTRINSIC_DURATION:
+	case VerificationNote::Code::INVALID_INTRINSIC_DURATION:
 		return String::compose("The intrinsic duration of the asset %1 is less than 1 second long.", note.note().get());
-	case VerificationNote::INVALID_DURATION:
+	case VerificationNote::Code::INVALID_DURATION:
 		return String::compose("The duration of the asset %1 is less than 1 second long.", note.note().get());
-	case VerificationNote::INVALID_PICTURE_FRAME_SIZE_IN_BYTES:
+	case VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES:
 		return String::compose("The instantaneous bit rate of the picture asset %1 is larger than the limit of 250Mbit/s in at least one place.", note.file()->filename());
-	case VerificationNote::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES:
+	case VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES:
 		return String::compose("The instantaneous bit rate of the picture asset %1 is close to the limit of 250Mbit/s in at least one place.", note.file()->filename());
-	case VerificationNote::EXTERNAL_ASSET:
+	case VerificationNote::Code::EXTERNAL_ASSET:
 		return String::compose("The asset %1 that this DCP refers to is not included in the DCP.  It may be a VF.", note.note().get());
-	case VerificationNote::INVALID_STANDARD:
+	case VerificationNote::Code::INVALID_STANDARD:
 		return "This DCP does not use the SMPTE standard.";
-	case VerificationNote::INVALID_LANGUAGE:
+	case VerificationNote::Code::INVALID_LANGUAGE:
 		return String::compose("The DCP specifies a language '%1' which does not conform to the RFC 5646 standard.", note.note().get());
-	case VerificationNote::INVALID_PICTURE_SIZE_IN_PIXELS:
+	case VerificationNote::Code::INVALID_PICTURE_SIZE_IN_PIXELS:
 		return String::compose("The size %1 of picture asset %2 is not allowed.", note.note().get(), note.file()->filename());
-	case VerificationNote::INVALID_PICTURE_FRAME_RATE_FOR_2K:
+	case VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K:
 		return String::compose("The frame rate %1 of picture asset %2 is not allowed for 2K DCPs.", note.note().get(), note.file()->filename());
-	case VerificationNote::INVALID_PICTURE_FRAME_RATE_FOR_4K:
+	case VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_4K:
 		return String::compose("The frame rate %1 of picture asset %2 is not allowed for 4K DCPs.", note.note().get(), note.file()->filename());
-	case VerificationNote::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D:
+	case VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D:
 		return "3D 4K DCPs are not allowed.";
-	case VerificationNote::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES:
+	case VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES:
 		return String::compose("The size %1 of the closed caption asset %2 is larger than the 256KB maximum.", note.note().get(), note.file()->filename());
-	case VerificationNote::INVALID_TIMED_TEXT_SIZE_IN_BYTES:
+	case VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES:
 		return String::compose("The size %1 of the timed text asset %2 is larger than the 115MB maximum.", note.note().get(), note.file()->filename());
-	case VerificationNote::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES:
+	case VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES:
 		return String::compose("The size %1 of the fonts in timed text asset %2 is larger than the 10MB maximum.", note.note().get(), note.file()->filename());
-	case VerificationNote::MISSING_SUBTITLE_LANGUAGE:
+	case VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE:
 		return String::compose("The XML for the SMPTE subtitle asset %1 has no <Language> tag.", note.file()->filename());
-	case VerificationNote::MISMATCHED_SUBTITLE_LANGUAGES:
+	case VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES:
 		return "Some subtitle assets have different <Language> tags than others";
-	case VerificationNote::MISSING_SUBTITLE_START_TIME:
+	case VerificationNote::Code::MISSING_SUBTITLE_START_TIME:
 		return String::compose("The XML for the SMPTE subtitle asset %1 has no <StartTime> tag.", note.file()->filename());
-	case VerificationNote::INVALID_SUBTITLE_START_TIME:
+	case VerificationNote::Code::INVALID_SUBTITLE_START_TIME:
 		return String::compose("The XML for a SMPTE subtitle asset %1 has a non-zero <StartTime> tag.", note.file()->filename());
-	case VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME:
+	case VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME:
 		return "The first subtitle or closed caption is less than 4 seconds from the start of the DCP.";
-	case VerificationNote::INVALID_SUBTITLE_DURATION:
+	case VerificationNote::Code::INVALID_SUBTITLE_DURATION:
 		return "At least one subtitle lasts less than 15 frames.";
-	case VerificationNote::INVALID_SUBTITLE_SPACING:
+	case VerificationNote::Code::INVALID_SUBTITLE_SPACING:
 		return "At least one pair of subtitles is separated by less than 2 frames.";
-	case VerificationNote::INVALID_SUBTITLE_LINE_COUNT:
+	case VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT:
 		return "There are more than 3 subtitle lines in at least one place in the DCP.";
-	case VerificationNote::NEARLY_INVALID_SUBTITLE_LINE_LENGTH:
+	case VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH:
 		return "There are more than 52 characters in at least one subtitle line.";
-	case VerificationNote::INVALID_SUBTITLE_LINE_LENGTH:
+	case VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH:
 		return "There are more than 79 characters in at least one subtitle line.";
-	case VerificationNote::INVALID_CLOSED_CAPTION_LINE_COUNT:
+	case VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT:
 		return "There are more than 3 closed caption lines in at least one place.";
-	case VerificationNote::INVALID_CLOSED_CAPTION_LINE_LENGTH:
+	case VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH:
 		return "There are more than 32 characters in at least one closed caption line.";
-	case VerificationNote::INVALID_SOUND_FRAME_RATE:
+	case VerificationNote::Code::INVALID_SOUND_FRAME_RATE:
 		return String::compose("The sound asset %1 has a sampling rate of %2", note.file()->filename(), note.note().get());
-	case VerificationNote::MISSING_CPL_ANNOTATION_TEXT:
+	case VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT:
 		return String::compose("The CPL %1 has no <AnnotationText> tag.", note.note().get());
-	case VerificationNote::MISMATCHED_CPL_ANNOTATION_TEXT:
+	case VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT:
 		return String::compose("The CPL %1 has an <AnnotationText> which differs from its <ContentTitleText>", note.note().get());
-	case VerificationNote::MISMATCHED_ASSET_DURATION:
+	case VerificationNote::Code::MISMATCHED_ASSET_DURATION:
 		return "All assets in a reel do not have the same duration.";
-	case VerificationNote::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS:
+	case VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS:
 		return "At least one reel contains a subtitle asset, but some reel(s) do not";
-	case VerificationNote::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS:
+	case VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS:
 		return "At least one reel has closed captions, but reels have different numbers of closed caption assets.";
-	case VerificationNote::MISSING_SUBTITLE_ENTRY_POINT:
+	case VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT:
 		return String::compose("The subtitle asset %1 has no <EntryPoint> tag.", note.note().get());
-	case VerificationNote::INCORRECT_SUBTITLE_ENTRY_POINT:
+	case VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT:
 		return String::compose("The subtitle asset %1 has an <EntryPoint> other than 0.", note.note().get());
-	case VerificationNote::MISSING_CLOSED_CAPTION_ENTRY_POINT:
+	case VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT:
 		return String::compose("The closed caption asset %1 has no <EntryPoint> tag.", note.note().get());
-	case VerificationNote::INCORRECT_CLOSED_CAPTION_ENTRY_POINT:
+	case VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT:
 		return String::compose("The closed caption asset %1 has an <EntryPoint> other than 0.", note.note().get());
-	case VerificationNote::MISSING_HASH:
+	case VerificationNote::Code::MISSING_HASH:
 		return String::compose("The asset %1 has no <Hash> tag in the CPL.", note.note().get());
-	case VerificationNote::MISSING_FFEC_IN_FEATURE:
+	case VerificationNote::Code::MISSING_FFEC_IN_FEATURE:
 		return "The DCP is marked as a Feature but there is no FFEC (first frame of end credits) marker";
-	case VerificationNote::MISSING_FFMC_IN_FEATURE:
+	case VerificationNote::Code::MISSING_FFMC_IN_FEATURE:
 		return "The DCP is marked as a Feature but there is no FFMC (first frame of moving credits) marker";
-	case VerificationNote::MISSING_FFOC:
+	case VerificationNote::Code::MISSING_FFOC:
 		return "There should be a FFOC (first frame of content) marker";
-	case VerificationNote::MISSING_LFOC:
+	case VerificationNote::Code::MISSING_LFOC:
 		return "There should be a LFOC (last frame of content) marker";
-	case VerificationNote::INCORRECT_FFOC:
+	case VerificationNote::Code::INCORRECT_FFOC:
 		return String::compose("The FFOC marker is %1 instead of 1", note.note().get());
-	case VerificationNote::INCORRECT_LFOC:
+	case VerificationNote::Code::INCORRECT_LFOC:
 		return String::compose("The LFOC marker is %1 instead of 1 less than the duration of the last reel.", note.note().get());
-	case VerificationNote::MISSING_CPL_METADATA:
+	case VerificationNote::Code::MISSING_CPL_METADATA:
 		return String::compose("The CPL %1 has no <CompositionMetadataAsset> tag.", note.note().get());
-	case VerificationNote::MISSING_CPL_METADATA_VERSION_NUMBER:
+	case VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER:
 		return String::compose("The CPL %1 has no <VersionNumber> in its <CompositionMetadataAsset>.", note.note().get());
-	case VerificationNote::MISSING_EXTENSION_METADATA:
+	case VerificationNote::Code::MISSING_EXTENSION_METADATA:
 		return String::compose("The CPL %1 has no <ExtensionMetadata> in its <CompositionMetadataAsset>.", note.note().get());
-	case VerificationNote::INVALID_EXTENSION_METADATA:
+	case VerificationNote::Code::INVALID_EXTENSION_METADATA:
 		return String::compose("The CPL %1 has a malformed <ExtensionMetadata> (%2).", note.file()->filename(), note.note().get());
-	case VerificationNote::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT:
+	case VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT:
 		return String::compose("The CPL %1, which has encrypted content, is not signed.", note.note().get());
-	case VerificationNote::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT:
+	case VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT:
 		return String::compose("The PKL %1, which has encrypted content, is not signed.", note.note().get());
-	case VerificationNote::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL:
+	case VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL:
 		return String::compose("The PKL %1 has only one CPL but its <AnnotationText> does not match the CPL's <ContentTitleText>", note.note().get());
-	case VerificationNote::PARTIALLY_ENCRYPTED:
+	case VerificationNote::Code::PARTIALLY_ENCRYPTED:
 		return "Some assets are encrypted but some are not";
 	}
 
diff --git a/src/verify.h b/src/verify.h
index ad733b01..b6722143 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -48,10 +48,10 @@ public:
 	/* I've been unable to make mingw happy with ERROR as a symbol, so
 	   I'm using a VERIFY_ prefix here.
 	*/
-	enum Type {
-		VERIFY_ERROR,
-		VERIFY_BV21_ERROR, ///< may not always be considered an error, but violates a "shall" requirement of Bv2.1
-		VERIFY_WARNING
+	enum class Type {
+		ERROR,
+		BV21_ERROR, ///< may not always be considered an error, but violates a "shall" requirement of Bv2.1
+		WARNING
 	};
 
 	/** Codes for errors or warnings from verifying DCPs.
@@ -74,7 +74,7 @@ public:
 	 *  Comments should clarify meaning and also say which of the optional fields (e.g. file)
 	 *  are filled in when this code is used.
 	 */
-	enum Code {
+	enum class Code {
 		/** An error when reading the DCP.
 		 *  note contains (probably technical) details.
 		 */
diff --git a/test/combine_test.cc b/test/combine_test.cc
index bd045a6d..fc34109b 100644
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -89,7 +89,7 @@ check_no_errors (boost::filesystem::path path)
 	auto notes = dcp::verify (directories, &stage, &progress, xsd_test);
 	vector<dcp::VerificationNote> filtered_notes;
 	std::copy_if (notes.begin(), notes.end(), std::back_inserter(filtered_notes), [](dcp::VerificationNote const& i) {
-		return i.code() != dcp::VerificationNote::INVALID_STANDARD && i.code() != dcp::VerificationNote::INVALID_SUBTITLE_DURATION;
+		return i.code() != dcp::VerificationNote::Code::INVALID_STANDARD && i.code() != dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION;
 	});
 	dump_notes (filtered_notes);
 	BOOST_CHECK (filtered_notes.empty());
@@ -128,19 +128,18 @@ check_combined (vector<boost::filesystem::path> inputs, boost::filesystem::path
 	dcp::EqualityOptions options;
 	options.load_font_nodes_can_differ = true;
 
-	BOOST_FOREACH (boost::filesystem::path i, inputs)
-	{
+	for (auto i: inputs) {
 		dcp::DCP input_dcp (i);
 		input_dcp.read ();
 
 		BOOST_REQUIRE (input_dcp.cpls().size() == 1);
-		shared_ptr<dcp::CPL> input_cpl = input_dcp.cpls().front();
+		auto input_cpl = input_dcp.cpls().front();
 
-		shared_ptr<dcp::CPL> output_cpl = pointer_to_id_in_vector (input_cpl, output_dcp.cpls());
+		auto output_cpl = pointer_to_id_in_vector (input_cpl, output_dcp.cpls());
 		BOOST_REQUIRE (output_cpl);
 
-		BOOST_FOREACH (shared_ptr<dcp::Asset> i, input_dcp.assets(true)) {
-			shared_ptr<dcp::Asset> o = pointer_to_id_in_vector(i, output_dcp.assets());
+		for (auto i: input_dcp.assets(true)) {
+			auto o = pointer_to_id_in_vector(i, output_dcp.assets());
 			BOOST_REQUIRE_MESSAGE (o, "Could not find " << i->id() << " in combined DCP.");
 			BOOST_CHECK (i->equals(o, options, note_handler));
 		}
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 78480956..a9d5c0a7 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -52,6 +52,7 @@
 #include "compose.hpp"
 #include "test.h"
 #include "raw_convert.h"
+#include "stream_operators.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
@@ -309,8 +310,8 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_picture_sound_hash)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INCORRECT_PICTURE_HASH, canonical(video_path) },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INCORRECT_SOUND_HASH, canonical(audio_path) },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_PICTURE_HASH, canonical(video_path) },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_SOUND_HASH, canonical(audio_path) },
 		});
 }
 
@@ -329,12 +330,12 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, "value 'xxz+gUPoPMdbFlAewvWIq8BRhBmA=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, "value 'xXGhFVrqZqapOJx5Fh2SLjj48Yjg=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, "value 'xqtXbkcwhUj/yqquVLmV+wbzbxQ8=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 }
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) },
+			{ 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::INVALID_XML, "value 'xxz+gUPoPMdbFlAewvWIq8BRhBmA=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xXGhFVrqZqapOJx5Fh2SLjj48Yjg=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xqtXbkcwhUj/yqquVLmV+wbzbxQ8=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 }
 		});
 }
 
@@ -350,7 +351,7 @@ BOOST_AUTO_TEST_CASE (verify_failed_read_content_kind)
 
 	check_verify_result (
 		{ dir },
-		{{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::FAILED_READ, string("Bad content kind 'xtrailer'")}}
+		{{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::FAILED_READ, string("Bad content kind 'xtrailer'")}}
 		);
 }
 
@@ -384,8 +385,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_rate)
 	check_verify_result_after_replace (
 			"invalid_picture_frame_rate", &cpl,
 			"<FrameRate>24 1", "<FrameRate>99 1",
-			{ dcp::VerificationNote::MISMATCHED_CPL_HASHES,
-			  dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE }
+			{ dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES,
+			  dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE }
 			);
 }
 
@@ -396,7 +397,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_asset)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISSING_ASSET, canonical(dir) / "video.mxf" }
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_ASSET, canonical(dir) / "video.mxf" }
 		});
 }
 
@@ -406,7 +407,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_asset_path)
 	check_verify_result_after_replace (
 			"empty_asset_path", &asset_map,
 			"<Path>video.mxf</Path>", "<Path></Path>",
-			{ dcp::VerificationNote::EMPTY_ASSET_PATH }
+			{ dcp::VerificationNote::Code::EMPTY_ASSET_PATH }
 			);
 }
 
@@ -416,13 +417,13 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_standard)
 	check_verify_result_after_replace (
 			"mismatched_standard", &cpl,
 			"http://www.smpte-ra.org/schemas/429-7/2006/CPL", "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#",
-			{ dcp::VerificationNote::MISMATCHED_STANDARD,
-			  dcp::VerificationNote::INVALID_XML,
-			  dcp::VerificationNote::INVALID_XML,
-			  dcp::VerificationNote::INVALID_XML,
-			  dcp::VerificationNote::INVALID_XML,
-			  dcp::VerificationNote::INVALID_XML,
-			  dcp::VerificationNote::MISMATCHED_CPL_HASHES }
+			{ dcp::VerificationNote::Code::MISMATCHED_STANDARD,
+			  dcp::VerificationNote::Code::INVALID_XML,
+			  dcp::VerificationNote::Code::INVALID_XML,
+			  dcp::VerificationNote::Code::INVALID_XML,
+			  dcp::VerificationNote::Code::INVALID_XML,
+			  dcp::VerificationNote::Code::INVALID_XML,
+			  dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES }
 			);
 }
 
@@ -433,7 +434,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_id)
 	check_verify_result_after_replace (
 			"invalid_xml_cpl_id", &cpl,
 			"<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375",
-			{ dcp::VerificationNote::INVALID_XML }
+			{ dcp::VerificationNote::Code::INVALID_XML }
 			);
 }
 
@@ -443,8 +444,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_issue_date)
 	check_verify_result_after_replace (
 			"invalid_xml_issue_date", &cpl,
 			"<IssueDate>", "<IssueDate>x",
-			{ dcp::VerificationNote::INVALID_XML,
-			  dcp::VerificationNote::MISMATCHED_CPL_HASHES }
+			{ dcp::VerificationNote::Code::INVALID_XML,
+			  dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES }
 			);
 }
 
@@ -454,7 +455,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_pkl_id)
 	check_verify_result_after_replace (
 		"invalid_xml_pkl_id", &pkl,
 		"<Id>urn:uuid:2b9", "<Id>urn:uuid:xb9",
-		{ dcp::VerificationNote::INVALID_XML }
+		{ dcp::VerificationNote::Code::INVALID_XML }
 		);
 }
 
@@ -464,7 +465,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_asset_map_id)
 	check_verify_result_after_replace (
 		"invalix_xml_asset_map_id", &asset_map,
 		"<Id>urn:uuid:07e", "<Id>urn:uuid:x7e",
-		{ dcp::VerificationNote::INVALID_XML }
+		{ dcp::VerificationNote::Code::INVALID_XML }
 		);
 }
 
@@ -519,8 +520,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_standard)
 
 	BOOST_REQUIRE_EQUAL (notes.size(), 1U);
 	auto i = notes.begin ();
-	BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
-	BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INVALID_STANDARD);
+	BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::Type::BV21_ERROR);
+	BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::Code::INVALID_STANDARD);
 }
 
 /* DCP with a short asset */
@@ -530,11 +531,11 @@ BOOST_AUTO_TEST_CASE (verify_invalid_duration)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_STANDARD },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_INTRINSIC_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_INTRINSIC_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") }
+			{ 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") }
 		});
 }
 
@@ -577,8 +578,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_size_in_bytes)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf") },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
 		});
 }
 
@@ -604,8 +605,8 @@ BOOST_AUTO_TEST_CASE (verify_nearly_invalid_picture_frame_size_in_bytes)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf") },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
 		});
 }
 
@@ -621,7 +622,7 @@ 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::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({ dir }, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -634,7 +635,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_interop_subtitles)
 	auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_STANDARD }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD }});
 }
 
 
@@ -657,11 +658,11 @@ BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_STANDARD },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 5 },
+			{ 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::VERIFY_ERROR,
-				dcp::VerificationNote::INVALID_XML,
+				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
@@ -679,7 +680,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles)
 	auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -697,16 +698,16 @@ BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 2 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 2 },
 			{
-				dcp::VerificationNote::VERIFY_ERROR,
-				dcp::VerificationNote::INVALID_XML,
+				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::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			{ 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() },
 		});
 }
 
@@ -733,8 +734,8 @@ BOOST_AUTO_TEST_CASE (verify_external_asset)
 	check_verify_result (
 		{ vf_dir },
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::EXTERNAL_ASSET, picture->asset()->id() },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -825,11 +826,11 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 54 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 55 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 54 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 55 },
 			{
-				dcp::VerificationNote::VERIFY_ERROR,
-				dcp::VerificationNote::INVALID_XML,
+				dcp::VerificationNote::Type::ERROR,
+				dcp::VerificationNote::Code::INVALID_XML,
 				string("element 'meta:MainSoundXConfiguration' is not allowed for content model "
 				       "'(Id,AnnotationText?,EditRate,IntrinsicDuration,EntryPoint?,Duration?,"
 				       "FullContentTitleText,ReleaseTerritory?,VersionNumber?,Chain?,Distributor?,"
@@ -839,7 +840,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 				canonical(cpl->file().get()),
 				75
 			},
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) },
 		});
 }
 
@@ -876,7 +877,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
 
 	check_verify_result (
 		{ dir },
-		{{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::FAILED_READ, string("missing XML tag Width in MainPictureStoredArea") }}
+		{{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::FAILED_READ, string("missing XML tag Width in MainPictureStoredArea") }}
 		);
 }
 
@@ -896,9 +897,9 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language1)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_LANGUAGE, string("badlang") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_LANGUAGE, string("wrong-andbad") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			{ 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() },
 		});
 }
 
@@ -919,9 +920,9 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language2)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_LANGUAGE, string("badlang") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_LANGUAGE, string("wrong-andbad") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -966,10 +967,10 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_LANGUAGE, string("this-is-wrong") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_LANGUAGE, string("andso-is-this") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_LANGUAGE, string("fred-jim") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_LANGUAGE, string("frobozz") },
+			{ 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") },
 		});
 }
 
@@ -1050,8 +1051,8 @@ check_picture_size_bad_frame_size (int width, int height, int frame_rate, bool t
 {
 	auto notes = check_picture_size(width, height, frame_rate, three_d);
 	BOOST_REQUIRE_EQUAL (notes.size(), 1U);
-	BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
-	BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::INVALID_PICTURE_SIZE_IN_PIXELS);
+	BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::Type::BV21_ERROR);
+	BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::INVALID_PICTURE_SIZE_IN_PIXELS);
 }
 
 
@@ -1061,8 +1062,8 @@ check_picture_size_bad_2k_frame_rate (int width, int height, int frame_rate, boo
 {
 	auto notes = check_picture_size(width, height, frame_rate, three_d);
 	BOOST_REQUIRE_EQUAL (notes.size(), 2U);
-	BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
-	BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE_FOR_2K);
+	BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::Type::BV21_ERROR);
+	BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K);
 }
 
 
@@ -1072,8 +1073,8 @@ check_picture_size_bad_4k_frame_rate (int width, int height, int frame_rate, boo
 {
 	auto notes = check_picture_size(width, height, frame_rate, three_d);
 	BOOST_REQUIRE_EQUAL (notes.size(), 1U);
-	BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
-	BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE_FOR_4K);
+	BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::Type::BV21_ERROR);
+	BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_4K);
 }
 
 
@@ -1121,8 +1122,8 @@ BOOST_AUTO_TEST_CASE (verify_picture_size)
 	/* No 4K 3D */
 	auto notes = check_picture_size(3996, 2160, 24, true);
 	BOOST_REQUIRE_EQUAL (notes.size(), 1U);
-	BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
-	BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D);
+	BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::Type::BV21_ERROR);
+	BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D);
 }
 
 
@@ -1173,15 +1174,15 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
 			{
-				dcp::VerificationNote::VERIFY_BV21_ERROR,
-				dcp::VerificationNote::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES,
+				dcp::VerificationNote::Type::BV21_ERROR,
+				dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES,
 				string("413262"),
 				canonical(dir / "subs.mxf")
 			},
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			{ 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() },
 		});
 }
 
@@ -1217,11 +1218,11 @@ verify_timed_text_asset_too_large (string name)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121696411"), canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121696411"), 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() },
 		});
 }
 
@@ -1280,8 +1281,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+			{ 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 }
 		});
 }
 
@@ -1321,9 +1322,9 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 	check_verify_result (
 		{ path },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISMATCHED_SUBTITLE_LANGUAGES },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") }
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") }
 		});
 }
 
@@ -1375,8 +1376,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+			{ 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 }
 		});
 }
 
@@ -1429,8 +1430,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+			{ 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 }
 		});
 }
 
@@ -1478,8 +1479,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_FIRST_TEXT_TIME },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 
 }
@@ -1490,7 +1491,7 @@ 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::ReelSubtitleAsset> (dir, {{ 4 * 24, 5 * 24 }});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1539,7 +1540,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 		);
 
 
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1555,8 +1556,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_SPACING },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1570,7 +1571,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
 			{ 4 * 24,      5 * 24 },
 			{ 5 * 24 + 16, 8 * 24 },
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1581,8 +1582,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_DURATION },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1591,7 +1592,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_duration)
 {
 	auto const dir = path("build/test/verify_valid_subtitle_duration");
 	auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 17 }});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1609,8 +1610,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_LINE_COUNT },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1625,7 +1626,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
 			{ 96, 200, 0.1, "have" },
 			{ 96, 200, 0.2, "four" },
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1643,8 +1644,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_LINE_COUNT },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1660,7 +1661,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
 			{ 150, 180, 0.2, "four" },
 			{ 190, 250, 0.3, "lines" }
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1675,8 +1676,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::NEARLY_INVALID_SUBTITLE_LINE_LENGTH },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1692,8 +1693,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INVALID_SUBTITLE_LINE_LENGTH },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1712,8 +1713,8 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_CLOSED_CAPTION_LINE_COUNT},
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1728,7 +1729,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
 			{ 96, 200, 0.1, "have" },
 			{ 96, 200, 0.2, "four" },
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1746,8 +1747,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_CLOSED_CAPTION_LINE_COUNT},
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1763,7 +1764,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
 			{ 150, 180, 0.2, "four" },
 			{ 190, 250, 0.3, "lines" }
 		});
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -1778,8 +1779,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_CLOSED_CAPTION_LINE_LENGTH },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ 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() }
 		});
 }
 
@@ -1812,8 +1813,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_SOUND_FRAME_RATE, string("96000"), canonical(dir / "audiofoo.mxf") },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+			{ 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() },
 		});
 }
 
@@ -1843,8 +1844,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
 		});
 }
 
@@ -1873,8 +1874,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
+			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
 		});
 }
 
@@ -1909,8 +1910,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISMATCHED_ASSET_DURATION },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), canonical(cpl->file().get()) }
+			{ 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()) }
 		});
 }
 
@@ -1982,8 +1983,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 		check_verify_result (
 			{ dir },
 			{
-				{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS },
-				{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+				{ 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() }
 			});
 
 	}
@@ -1991,13 +1992,13 @@ 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::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+		check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 	}
 
 	{
 		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::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+		check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 	}
 }
 
@@ -2067,21 +2068,21 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
 		check_verify_result (
 			{dir},
 			{
-				{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS },
-				{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+				{ 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() }
 			});
 	}
 
 	{
 		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::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+		check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 	}
 
 	{
 		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::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+		check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
 	}
 }
 
@@ -2125,8 +2126,8 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, code, subs->id() },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+			{ dcp::VerificationNote::Type::BV21_ERROR, code, subs->id() },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
 		});
 }
 
@@ -2135,7 +2136,7 @@ BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 {
 	verify_text_entry_point_check<dcp::ReelSubtitleAsset> (
 		"build/test/verify_subtitle_entry_point_must_be_present",
-		dcp::VerificationNote::MISSING_SUBTITLE_ENTRY_POINT,
+		dcp::VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT,
 		[](shared_ptr<dcp::ReelSubtitleAsset> asset) {
 			asset->unset_entry_point ();
 			}
@@ -2143,7 +2144,7 @@ BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 
 	verify_text_entry_point_check<dcp::ReelSubtitleAsset> (
 		"build/test/verify_subtitle_entry_point_must_be_zero",
-		dcp::VerificationNote::INCORRECT_SUBTITLE_ENTRY_POINT,
+		dcp::VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT,
 		[](shared_ptr<dcp::ReelSubtitleAsset> asset) {
 			asset->set_entry_point (4);
 			}
@@ -2151,7 +2152,7 @@ BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 
 	verify_text_entry_point_check<dcp::ReelClosedCaptionAsset> (
 		"build/test/verify_closed_caption_entry_point_must_be_present",
-		dcp::VerificationNote::MISSING_CLOSED_CAPTION_ENTRY_POINT,
+		dcp::VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT,
 		[](shared_ptr<dcp::ReelClosedCaptionAsset> asset) {
 			asset->unset_entry_point ();
 			}
@@ -2159,7 +2160,7 @@ BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 
 	verify_text_entry_point_check<dcp::ReelClosedCaptionAsset> (
 		"build/test/verify_closed_caption_entry_point_must_be_zero",
-		dcp::VerificationNote::INCORRECT_CLOSED_CAPTION_ENTRY_POINT,
+		dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT,
 		[](shared_ptr<dcp::ReelClosedCaptionAsset> asset) {
 			asset->set_entry_point (9);
 			}
@@ -2193,8 +2194,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_HASH, string("1fab8bb0-cfaf-4225-ad6d-01768bc10470") }
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_HASH, string("1fab8bb0-cfaf-4225-ad6d-01768bc10470") }
 		});
 }
 
@@ -2247,7 +2248,7 @@ BOOST_AUTO_TEST_CASE (verify_markers)
 			{ dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
 		},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_FFEC_IN_FEATURE }
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE }
 		});
 
 	verify_markers_test (
@@ -2258,7 +2259,7 @@ BOOST_AUTO_TEST_CASE (verify_markers)
 			{ dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
 		},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_FFMC_IN_FEATURE }
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE }
 		});
 
 	verify_markers_test (
@@ -2269,7 +2270,7 @@ BOOST_AUTO_TEST_CASE (verify_markers)
 			{ dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
 		},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_FFOC}
+			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC}
 		});
 
 	verify_markers_test (
@@ -2280,7 +2281,7 @@ BOOST_AUTO_TEST_CASE (verify_markers)
 			{ dcp::Marker::FFOC, dcp::Time(1, 24, 24) }
 		},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_LFOC }
+			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC }
 		});
 
 	verify_markers_test (
@@ -2292,7 +2293,7 @@ BOOST_AUTO_TEST_CASE (verify_markers)
 			{ dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
 		},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INCORRECT_FFOC, string("3") }
+			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_FFOC, string("3") }
 		});
 
 	verify_markers_test (
@@ -2304,7 +2305,7 @@ BOOST_AUTO_TEST_CASE (verify_markers)
 			{ dcp::Marker::LFOC, dcp::Time(18, 24, 24) }
 		},
 		{
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::INCORRECT_LFOC, string("18") }
+			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_LFOC, string("18") }
 		});
 }
 
@@ -2324,7 +2325,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
 		"A Test DCP"
 		);
 
-	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get() }});
+	check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get() }});
 }
 
 
@@ -2350,8 +2351,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
 		});
 }
 
@@ -2378,8 +2379,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
 		});
 }
 
@@ -2407,9 +2408,9 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 75 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 75 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
 		});
 }
 
@@ -2436,8 +2437,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_EXTENSION_METADATA, string("<Name> should be 'Application'"), cpl->file().get() },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> should be 'Application'"), cpl->file().get() },
 		});
 }
 
@@ -2464,8 +2465,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::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->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> property should be 'DCP Constraints Profile'"), cpl->file().get() },
 		});
 }
 
@@ -2493,9 +2494,9 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 79 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 80 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 79 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 80 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
 		});
 }
 
@@ -2522,8 +2523,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::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->id(), cpl->file().get() },
+			{ 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() },
 		});
 }
 
@@ -2551,9 +2552,9 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 77 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 81 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 77 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 81 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
 		});
 }
 
@@ -2581,9 +2582,9 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 76 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 76 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
 		});
 }
 
@@ -2610,14 +2611,14 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_cpl_with_encrypted_content)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISMATCHED_CPL_HASHES, cpl_id, canonical(cpl) },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, pkl_id, canonical(pkl), },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_FFEC_IN_FEATURE },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_FFMC_IN_FEATURE },
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_FFOC },
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_LFOC },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl_id, canonical(cpl) },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl_id, canonical(cpl) }
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl_id, canonical(cpl) },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, 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, cpl_id, canonical(cpl) },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl_id, canonical(cpl) }
 		});
 }
 
@@ -2642,13 +2643,13 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_encrypted_content)
 	check_verify_result (
 		{dir},
 		{
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, pkl_id, canonical(pkl) },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_FFEC_IN_FEATURE },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_FFMC_IN_FEATURE },
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_FFOC },
-			{ dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_LFOC },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::MISSING_CPL_METADATA, cpl_id, canonical(cpl) },
-			{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl_id, canonical(pkl) },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, 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, cpl_id, canonical(cpl) },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl_id, canonical(pkl) },
 		});
 }
 
@@ -2725,6 +2726,6 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 
 	d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP", signer);
 
-	check_verify_result ({dir}, {{dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::PARTIALLY_ENCRYPTED}});
+	check_verify_result ({dir}, {{dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED}});
 }
 
diff --git a/tools/common.cc b/tools/common.cc
index 73d62679..54bee6b5 100644
--- a/tools/common.cc
+++ b/tools/common.cc
@@ -47,7 +47,7 @@ dcp::filter_notes (vector<dcp::VerificationNote>& notes, bool ignore_missing_ass
 
 	vector<dcp::VerificationNote> filtered;
 	std::copy_if (notes.begin(), notes.end(), std::back_inserter(filtered), [](dcp::VerificationNote const& i) {
-		return i.code() != dcp::VerificationNote::MISSING_ASSET && i.code() != dcp::VerificationNote::EXTERNAL_ASSET;
+		return i.code() != dcp::VerificationNote::Code::MISSING_ASSET && i.code() != dcp::VerificationNote::Code::EXTERNAL_ASSET;
 	});
 
 	notes = filtered;
diff --git a/tools/dcpverify.cc b/tools/dcpverify.cc
index 138f9ca3..b3ac5f06 100644
--- a/tools/dcpverify.cc
+++ b/tools/dcpverify.cc
@@ -143,18 +143,18 @@ main (int argc, char* argv[])
 
 	bool failed = false;
 	BOOST_FOREACH (dcp::VerificationNote i, notes) {
-		if (ignore_bv21_smpte && i.code() == dcp::VerificationNote::INVALID_STANDARD) {
+		if (ignore_bv21_smpte && i.code() == dcp::VerificationNote::Code::INVALID_STANDARD) {
 			continue;
 		}
 		switch (i.type()) {
-		case dcp::VerificationNote::VERIFY_ERROR:
+		case dcp::VerificationNote::Type::ERROR:
 			cout << "Error: " << note_to_string(i) << "\n";
 			failed = true;
 			break;
-		case dcp::VerificationNote::VERIFY_BV21_ERROR:
+		case dcp::VerificationNote::Type::BV21_ERROR:
 			cout << "Bv2.1 error: " << note_to_string(i) << "\n";
 			break;
-		case dcp::VerificationNote::VERIFY_WARNING:
+		case dcp::VerificationNote::Type::WARNING:
 			cout << "Warning: " << note_to_string(i) << "\n";
 			break;
 		}