Use enum class for the things in types.h

24 files changed, 667 insertions, 687 deletions

diff --git a/test/combine_test.cc b/test/combine_test.cc
index 81fb08ba..bd045a6d 100644
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -178,7 +178,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_same_asset_filenames_test)
 	boost::filesystem::path const out = "build/test/combine_two_dcps_with_same_asset_filenames_test";
 
 	shared_ptr<dcp::DCP> second = make_simple ("build/test/combine_input2");
-	second->write_xml (dcp::SMPTE);
+	second->write_xml (dcp::Standard::SMPTE);
 
 	remove_all (out);
 	vector<path> inputs;
@@ -198,10 +198,10 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_interop_subs_test)
 	boost::filesystem::path const out = "build/test/combine_two_dcps_with_interop_subs_test";
 
 	shared_ptr<dcp::DCP> first = make_simple_with_interop_subs ("build/test/combine_input1");
-	first->write_xml (dcp::INTEROP);
+	first->write_xml (dcp::Standard::INTEROP);
 
 	shared_ptr<dcp::DCP> second = make_simple_with_interop_subs ("build/test/combine_input2");
-	second->write_xml (dcp::INTEROP);
+	second->write_xml (dcp::Standard::INTEROP);
 
 	remove_all (out);
 	vector<path> inputs;
@@ -221,10 +221,10 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_smpte_subs_test)
 	boost::filesystem::path const out = "build/test/combine_two_dcps_with_smpte_subs_test";
 
 	shared_ptr<dcp::DCP> first = make_simple_with_smpte_subs ("build/test/combine_input1");
-	first->write_xml (dcp::SMPTE);
+	first->write_xml (dcp::Standard::SMPTE);
 
 	shared_ptr<dcp::DCP> second = make_simple_with_smpte_subs ("build/test/combine_input2");
-	second->write_xml (dcp::SMPTE);
+	second->write_xml (dcp::Standard::SMPTE);
 
 	remove_all (out);
 	vector<path> inputs;
@@ -244,10 +244,10 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_interop_ccaps_test)
 	boost::filesystem::path const out = "build/test/combine_two_dcps_with_interop_ccaps_test";
 
 	shared_ptr<dcp::DCP> first = make_simple_with_interop_ccaps ("build/test/combine_input1");
-	first->write_xml (dcp::INTEROP);
+	first->write_xml (dcp::Standard::INTEROP);
 
 	shared_ptr<dcp::DCP> second = make_simple_with_interop_ccaps ("build/test/combine_input2");
-	second->write_xml (dcp::INTEROP);
+	second->write_xml (dcp::Standard::INTEROP);
 
 	remove_all (out);
 	vector<path> inputs;
@@ -267,10 +267,10 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_smpte_ccaps_test)
 	boost::filesystem::path const out = "build/test/combine_two_dcps_with_interop_ccaps_test";
 
 	shared_ptr<dcp::DCP> first = make_simple_with_smpte_ccaps ("build/test/combine_input1");
-	first->write_xml (dcp::SMPTE);
+	first->write_xml (dcp::Standard::SMPTE);
 
 	shared_ptr<dcp::DCP> second = make_simple_with_smpte_ccaps ("build/test/combine_input2");
-	second->write_xml (dcp::SMPTE);
+	second->write_xml (dcp::Standard::SMPTE);
 
 	remove_all (out);
 	vector<path> inputs;
@@ -290,10 +290,10 @@ BOOST_AUTO_TEST_CASE (combine_two_multi_reel_dcps)
 	boost::filesystem::path const out = "build/test/combine_two_multi_reel_dcps";
 
 	shared_ptr<dcp::DCP> first = make_simple ("build/test/combine_input1", 4);
-	first->write_xml (dcp::SMPTE);
+	first->write_xml (dcp::Standard::SMPTE);
 
 	shared_ptr<dcp::DCP> second = make_simple ("build/test/combine_input2", 4);
-	second->write_xml (dcp::SMPTE);
+	second->write_xml (dcp::Standard::SMPTE);
 
 	remove_all (out);
 	vector<path> inputs;
@@ -312,7 +312,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_shared_asset)
 	boost::filesystem::path const out = "build/test/combine_two_dcps_with_shared_asset";
 
 	shared_ptr<dcp::DCP> first = make_simple ("build/test/combine_input1", 1);
-	first->write_xml (dcp::SMPTE);
+	first->write_xml (dcp::Standard::SMPTE);
 
 	remove_all ("build/test/combine_input2");
 	shared_ptr<dcp::DCP> second(new dcp::DCP("build/test/combine_input2"));
@@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_shared_asset)
 	mxf_meta.company_name = "OpenDCP";
 	mxf_meta.product_version = "0.0.25";
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL("A Test DCP", dcp::TRAILER));
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
 	cpl->set_content_version (
 		dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11","content-version-label-text")
 		);
@@ -331,13 +331,13 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_shared_asset)
 	cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
 	cpl->set_version_number(1);
 
-	shared_ptr<dcp::ReelMonoPictureAsset> pic(new dcp::ReelMonoPictureAsset(simple_picture("build/test/combine_input2", ""), 0));
-	shared_ptr<dcp::ReelSoundAsset> sound(new dcp::ReelSoundAsset(first->cpls().front()->reels().front()->main_sound()->asset(), 0));
+	auto pic = make_shared<dcp::ReelMonoPictureAsset>(simple_picture("build/test/combine_input2", ""), 0);
+	auto sound = make_shared<dcp::ReelSoundAsset>(first->cpls().front()->reels().front()->main_sound()->asset(), 0);
 	auto reel = make_shared<dcp::Reel>(pic, sound);
 	reel->add (simple_markers());
 	cpl->add (reel);
 	second->add (cpl);
-	second->write_xml (dcp::SMPTE);
+	second->write_xml (dcp::Standard::SMPTE);
 
 	remove_all (out);
 	vector<path> inputs;
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc
index a6dcd834..45afecb3 100644
--- a/test/cpl_metadata_test.cc
+++ b/test/cpl_metadata_test.cc
@@ -51,7 +51,7 @@ using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (cpl_metadata_bad_values_test)
 {
-	dcp::CPL cpl("", dcp::FEATURE);
+	dcp::CPL cpl("", dcp::ContentKind::FEATURE);
 	BOOST_CHECK_THROW (cpl.set_version_number(-1), dcp::BadSettingError);
 
 	vector<dcp::ContentVersion> cv;
@@ -66,11 +66,11 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test1)
 	dcp::MainSoundConfiguration msc("51/L,R,C,LFE,-,-");
 	BOOST_CHECK_EQUAL (msc.to_string(), "51/L,R,C,LFE,-,-");
 	BOOST_CHECK_EQUAL (msc.channels(), 6);
-	BOOST_CHECK_EQUAL (msc.field(), dcp::FIVE_POINT_ONE);
-	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::LEFT);
-	BOOST_CHECK_EQUAL (msc.mapping(1).get(), dcp::RIGHT);
-	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::CENTRE);
-	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::LFE);
+	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::FIVE_POINT_ONE);
+	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
+	BOOST_CHECK_EQUAL (msc.mapping(1).get(), dcp::Channel::RIGHT);
+	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::Channel::CENTRE);
+	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::Channel::LFE);
 	BOOST_CHECK (!msc.mapping(4));
 	BOOST_CHECK (!msc.mapping(5));
 }
@@ -81,11 +81,11 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test2)
 	dcp::MainSoundConfiguration msc("71/L,R,C,LFE,-,-");
 	BOOST_CHECK_EQUAL (msc.to_string(), "71/L,R,C,LFE,-,-");
 	BOOST_CHECK_EQUAL (msc.channels(), 6);
-	BOOST_CHECK_EQUAL (msc.field(), dcp::SEVEN_POINT_ONE);
-	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::LEFT);
-	BOOST_CHECK_EQUAL (msc.mapping(1).get(), dcp::RIGHT);
-	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::CENTRE);
-	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::LFE);
+	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::SEVEN_POINT_ONE);
+	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
+	BOOST_CHECK_EQUAL (msc.mapping(1).get(), dcp::Channel::RIGHT);
+	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::Channel::CENTRE);
+	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::Channel::LFE);
 	BOOST_CHECK (!msc.mapping(4));
 	BOOST_CHECK (!msc.mapping(5));
 }
@@ -96,13 +96,13 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test3)
 	dcp::MainSoundConfiguration msc("71/L,-,C,LFE,Lss,Rss");
 	BOOST_CHECK_EQUAL (msc.to_string(), "71/L,-,C,LFE,Lss,Rss");
 	BOOST_CHECK_EQUAL (msc.channels(), 6);
-	BOOST_CHECK_EQUAL (msc.field(), dcp::SEVEN_POINT_ONE);
-	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::LEFT);
+	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::SEVEN_POINT_ONE);
+	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
 	BOOST_CHECK (!msc.mapping(1));
-	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::CENTRE);
-	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::LFE);
-	BOOST_CHECK_EQUAL (msc.mapping(4).get(), dcp::LS);
-	BOOST_CHECK_EQUAL (msc.mapping(5).get(), dcp::RS);
+	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::Channel::CENTRE);
+	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::Channel::LFE);
+	BOOST_CHECK_EQUAL (msc.mapping(4).get(), dcp::Channel::LS);
+	BOOST_CHECK_EQUAL (msc.mapping(5).get(), dcp::Channel::RS);
 }
 
 
@@ -111,13 +111,13 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test4)
 	dcp::MainSoundConfiguration msc("71/L,-,C,LFE,Lss,Rss,-,-,-,-,-,-,-,-,-");
 	BOOST_CHECK_EQUAL (msc.to_string(), "71/L,-,C,LFE,Lss,Rss,-,-,-,-,-,-,-,-,-");
 	BOOST_CHECK_EQUAL (msc.channels(), 15);
-	BOOST_CHECK_EQUAL (msc.field(), dcp::SEVEN_POINT_ONE);
-	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::LEFT);
+	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::SEVEN_POINT_ONE);
+	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
 	BOOST_CHECK (!msc.mapping(1));
-	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::CENTRE);
-	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::LFE);
-	BOOST_CHECK_EQUAL (msc.mapping(4).get(), dcp::LS);
-	BOOST_CHECK_EQUAL (msc.mapping(5).get(), dcp::RS);
+	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::Channel::CENTRE);
+	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::Channel::LFE);
+	BOOST_CHECK_EQUAL (msc.mapping(4).get(), dcp::Channel::LS);
+	BOOST_CHECK_EQUAL (msc.mapping(5).get(), dcp::Channel::RS);
 	for (int i = 6; i < 15; ++i) {
 		BOOST_CHECK (!msc.mapping(i));
 	}
@@ -129,29 +129,29 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test5)
 	dcp::MainSoundConfiguration msc("71/L,-,C,LFE,Lss,Rss,HI,VIN,-,-,Lrs,Rrs,DBOX,FSKSync,SLVS");
 	BOOST_CHECK_EQUAL (msc.to_string(), "71/L,-,C,LFE,Lss,Rss,HI,VIN,-,-,Lrs,Rrs,DBOX,FSKSync,SLVS");
 	BOOST_CHECK_EQUAL (msc.channels(), 15);
-	BOOST_CHECK_EQUAL (msc.field(), dcp::SEVEN_POINT_ONE);
-	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::LEFT);
+	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::SEVEN_POINT_ONE);
+	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
 	BOOST_CHECK (!msc.mapping(1));
-	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::CENTRE);
-	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::LFE);
-	BOOST_CHECK_EQUAL (msc.mapping(4).get(), dcp::LS);
-	BOOST_CHECK_EQUAL (msc.mapping(5).get(), dcp::RS);
-	BOOST_CHECK_EQUAL (msc.mapping(6).get(), dcp::HI);
-	BOOST_CHECK_EQUAL (msc.mapping(7).get(), dcp::VI);
+	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::Channel::CENTRE);
+	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::Channel::LFE);
+	BOOST_CHECK_EQUAL (msc.mapping(4).get(), dcp::Channel::LS);
+	BOOST_CHECK_EQUAL (msc.mapping(5).get(), dcp::Channel::RS);
+	BOOST_CHECK_EQUAL (msc.mapping(6).get(), dcp::Channel::HI);
+	BOOST_CHECK_EQUAL (msc.mapping(7).get(), dcp::Channel::VI);
 	BOOST_CHECK (!msc.mapping(8));
 	BOOST_CHECK (!msc.mapping(9));
-	BOOST_CHECK_EQUAL (msc.mapping(10).get(), dcp::BSL);
-	BOOST_CHECK_EQUAL (msc.mapping(11).get(), dcp::BSR);
-	BOOST_CHECK_EQUAL (msc.mapping(12).get(), dcp::MOTION_DATA);
-	BOOST_CHECK_EQUAL (msc.mapping(13).get(), dcp::SYNC_SIGNAL);
-	BOOST_CHECK_EQUAL (msc.mapping(14).get(), dcp::SIGN_LANGUAGE);
+	BOOST_CHECK_EQUAL (msc.mapping(10).get(), dcp::Channel::BSL);
+	BOOST_CHECK_EQUAL (msc.mapping(11).get(), dcp::Channel::BSR);
+	BOOST_CHECK_EQUAL (msc.mapping(12).get(), dcp::Channel::MOTION_DATA);
+	BOOST_CHECK_EQUAL (msc.mapping(13).get(), dcp::Channel::SYNC_SIGNAL);
+	BOOST_CHECK_EQUAL (msc.mapping(14).get(), dcp::Channel::SIGN_LANGUAGE);
 }
 
 
 BOOST_AUTO_TEST_CASE (luminance_test1)
 {
-	BOOST_CHECK_NO_THROW (dcp::Luminance(4, dcp::Luminance::CANDELA_PER_SQUARE_METRE));
-	BOOST_CHECK_THROW (dcp::Luminance(-4, dcp::Luminance::CANDELA_PER_SQUARE_METRE), dcp::MiscError);
+	BOOST_CHECK_NO_THROW (dcp::Luminance(4, dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE));
+	BOOST_CHECK_THROW (dcp::Luminance(-4, dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE), dcp::MiscError);
 }
 
 
@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE (luminance_test2)
 		);
 
 	dcp::Luminance lum (doc);
-	BOOST_CHECK (lum.unit() == dcp::Luminance::CANDELA_PER_SQUARE_METRE);
+	BOOST_CHECK (lum.unit() == dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE);
 	BOOST_CHECK_CLOSE (lum.value(), 4.5, 0.1);
 }
 
@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE (luminance_test4)
 
 	/* We tolerate out-of-range values when reading from XML */
 	dcp::Luminance lum (doc);
-	BOOST_CHECK (lum.unit() == dcp::Luminance::CANDELA_PER_SQUARE_METRE);
+	BOOST_CHECK (lum.unit() == dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE);
 	BOOST_CHECK_CLOSE (lum.value(), -4.5, 0.1);
 }
 
@@ -205,17 +205,17 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test1)
 	BOOST_CHECK (cpl.full_content_title_text_language().get() == "de");
 	BOOST_CHECK (cpl.release_territory().get() == "ES");
 	BOOST_CHECK_EQUAL (cpl.version_number().get(), 2);
-	BOOST_CHECK_EQUAL (cpl.status().get(), dcp::FINAL);
+	BOOST_CHECK_EQUAL (cpl.status().get(), dcp::Status::FINAL);
 	BOOST_CHECK_EQUAL (cpl.chain().get(), "the-chain");
 	BOOST_CHECK_EQUAL (cpl.distributor().get(), "the-distributor");
 	BOOST_CHECK_EQUAL (cpl.facility().get(), "the-facility");
-	BOOST_CHECK (cpl.luminance() == dcp::Luminance(4.5, dcp::Luminance::FOOT_LAMBERT));
+	BOOST_CHECK (cpl.luminance() == dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT));
 
 	dcp::MainSoundConfiguration msc(cpl.main_sound_configuration().get());
-	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::LEFT);
-	BOOST_CHECK_EQUAL (msc.mapping(1).get(), dcp::RIGHT);
-	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::CENTRE);
-	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::LFE);
+	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
+	BOOST_CHECK_EQUAL (msc.mapping(1).get(), dcp::Channel::RIGHT);
+	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::Channel::CENTRE);
+	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::Channel::LFE);
 	BOOST_CHECK (!msc.mapping(4));
 	BOOST_CHECK (!msc.mapping(5));
 	BOOST_CHECK (!msc.mapping(6));
@@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test1)
 	BOOST_CHECK (!msc.mapping(10));
 	BOOST_CHECK (!msc.mapping(11));
 	BOOST_CHECK (!msc.mapping(12));
-	BOOST_CHECK_EQUAL (msc.mapping(13).get(), dcp::SYNC_SIGNAL);
+	BOOST_CHECK_EQUAL (msc.mapping(13).get(), dcp::Channel::SYNC_SIGNAL);
 
 	BOOST_CHECK_EQUAL (cpl.main_sound_sample_rate().get(), 48000);
 	BOOST_CHECK (cpl.main_picture_stored_area().get() == dcp::Size(1998, 1080));
@@ -250,7 +250,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
 {
 	RNGFixer fix;
 
-	dcp::CPL cpl("", dcp::FEATURE);
+	dcp::CPL cpl("", dcp::ContentKind::FEATURE);
 	cpl.set_issue_date ("2020-08-28T13:35:06+02:00");
 
 	vector<dcp::ContentVersion> cv;
@@ -262,20 +262,20 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
 	cpl.set_full_content_title_text_language (dcp::LanguageTag("de"));
 	cpl.set_release_territory (dcp::LanguageTag::RegionSubtag("ES"));
 	cpl.set_version_number (2);
-	cpl.set_status (dcp::FINAL);
+	cpl.set_status (dcp::Status::FINAL);
 	cpl.set_chain ("the-chain");
 	cpl.set_distributor ("the-distributor");
 	cpl.set_facility ("the-facility");
-	cpl.set_luminance (dcp::Luminance(4.5, dcp::Luminance::FOOT_LAMBERT));
+	cpl.set_luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT));
 	cpl.set_issuer ("libdcp1.6.4devel");
 	cpl.set_creator ("libdcp1.6.4devel");
 
-	dcp::MainSoundConfiguration msc(dcp::SEVEN_POINT_ONE, 16);
-	msc.set_mapping (0, dcp::LEFT);
-	msc.set_mapping (1, dcp::RIGHT);
-	msc.set_mapping (2, dcp::CENTRE);
-	msc.set_mapping (3, dcp::LFE);
-	msc.set_mapping (13, dcp::SYNC_SIGNAL);
+	dcp::MainSoundConfiguration msc(dcp::MCASoundField::SEVEN_POINT_ONE, 16);
+	msc.set_mapping (0, dcp::Channel::LEFT);
+	msc.set_mapping (1, dcp::Channel::RIGHT);
+	msc.set_mapping (2, dcp::Channel::CENTRE);
+	msc.set_mapping (3, dcp::Channel::LFE);
+	msc.set_mapping (13, dcp::Channel::SYNC_SIGNAL);
 	cpl.set_main_sound_configuration (msc.to_string());
 
 	cpl.set_main_sound_sample_rate (48000);
@@ -308,7 +308,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
 	lt.push_back(dcp::LanguageTag("fr-ZA"));
 	cpl.set_additional_subtitle_languages (lt);
 
-	cpl.write_xml ("build/test/cpl_metadata_write_test1.xml", dcp::SMPTE, shared_ptr<dcp::CertificateChain>());
+	cpl.write_xml ("build/test/cpl_metadata_write_test1.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
 	check_xml (
 		dcp::file_to_string("test/ref/cpl_metadata_test1.xml"),
 		dcp::file_to_string("build/test/cpl_metadata_write_test1.xml"),
@@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
 BOOST_AUTO_TEST_CASE (cpl_metadata_roundtrip_test_1)
 {
 	dcp::CPL cpl ("test/ref/cpl_metadata_test1.xml");
-	cpl.write_xml ("build/test/cpl_metadata_roundtrip_test1.xml", dcp::SMPTE, shared_ptr<dcp::CertificateChain>());
+	cpl.write_xml ("build/test/cpl_metadata_roundtrip_test1.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
 	vector<string> ignore;
 	ignore.push_back ("Id");
 	check_xml (
@@ -337,18 +337,18 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test2)
 {
 	RNGFixer fix;
 
-	dcp::CPL cpl("", dcp::FEATURE);
+	dcp::CPL cpl("", dcp::ContentKind::FEATURE);
 	cpl.set_issue_date ("2020-08-28T13:35:06+02:00");
 	cpl.set_content_version (dcp::ContentVersion("id", "version"));
 	cpl.set_issuer ("libdcp1.6.4devel");
 	cpl.set_creator ("libdcp1.6.4devel");
 
-	dcp::MainSoundConfiguration msc(dcp::SEVEN_POINT_ONE, 16);
-	msc.set_mapping (0, dcp::LEFT);
-	msc.set_mapping (1, dcp::RIGHT);
-	msc.set_mapping (2, dcp::CENTRE);
-	msc.set_mapping (3, dcp::LFE);
-	msc.set_mapping (13, dcp::SYNC_SIGNAL);
+	dcp::MainSoundConfiguration msc(dcp::MCASoundField::SEVEN_POINT_ONE, 16);
+	msc.set_mapping (0, dcp::Channel::LEFT);
+	msc.set_mapping (1, dcp::Channel::RIGHT);
+	msc.set_mapping (2, dcp::Channel::CENTRE);
+	msc.set_mapping (3, dcp::Channel::LFE);
+	msc.set_mapping (13, dcp::Channel::SYNC_SIGNAL);
 	cpl.set_main_sound_configuration (msc.to_string());
 
 	cpl.set_main_sound_sample_rate (48000);
@@ -359,7 +359,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test2)
 	reel->add (black_picture_asset("build/test/cpl_metadata_write_test1"));
 	cpl.add (reel);
 
-	cpl.write_xml ("build/test/cpl_metadata_write_test2.xml", dcp::SMPTE, shared_ptr<dcp::CertificateChain>());
+	cpl.write_xml ("build/test/cpl_metadata_write_test2.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
 	check_xml (
 		dcp::file_to_string("test/ref/cpl_metadata_test2.xml"),
 		dcp::file_to_string("build/test/cpl_metadata_write_test2.xml"),
@@ -384,10 +384,10 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test2)
 	BOOST_CHECK (!cpl.luminance());
 
 	dcp::MainSoundConfiguration msc(cpl.main_sound_configuration().get());
-	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::LEFT);
-	BOOST_CHECK_EQUAL (msc.mapping(1).get(), dcp::RIGHT);
-	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::CENTRE);
-	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::LFE);
+	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
+	BOOST_CHECK_EQUAL (msc.mapping(1).get(), dcp::Channel::RIGHT);
+	BOOST_CHECK_EQUAL (msc.mapping(2).get(), dcp::Channel::CENTRE);
+	BOOST_CHECK_EQUAL (msc.mapping(3).get(), dcp::Channel::LFE);
 	BOOST_CHECK (!msc.mapping(4));
 	BOOST_CHECK (!msc.mapping(5));
 	BOOST_CHECK (!msc.mapping(6));
@@ -397,7 +397,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test2)
 	BOOST_CHECK (!msc.mapping(10));
 	BOOST_CHECK (!msc.mapping(11));
 	BOOST_CHECK (!msc.mapping(12));
-	BOOST_CHECK_EQUAL (msc.mapping(13).get(), dcp::SYNC_SIGNAL);
+	BOOST_CHECK_EQUAL (msc.mapping(13).get(), dcp::Channel::SYNC_SIGNAL);
 
 	BOOST_CHECK_EQUAL (cpl.main_sound_sample_rate().get(), 48000);
 	BOOST_CHECK (cpl.main_picture_stored_area().get() == dcp::Size(1998, 1080));
@@ -412,7 +412,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test2)
 BOOST_AUTO_TEST_CASE (cpl_metadata_roundtrip_test_2)
 {
 	dcp::CPL cpl ("test/ref/cpl_metadata_test2.xml");
-	cpl.write_xml ("build/test/cpl_metadata_roundtrip_test2.xml", dcp::SMPTE, shared_ptr<dcp::CertificateChain>());
+	cpl.write_xml ("build/test/cpl_metadata_roundtrip_test2.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
 	vector<string> ignore;
 	ignore.push_back ("Id");
 	check_xml (
diff --git a/test/cpl_ratings_test.cc b/test/cpl_ratings_test.cc
index b5bfd389..0135e6e0 100644
--- a/test/cpl_ratings_test.cc
+++ b/test/cpl_ratings_test.cc
@@ -42,7 +42,7 @@ using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (cpl_ratings)
 {
-	dcp::CPL cpl ("annotation", dcp::FEATURE);
+	dcp::CPL cpl ("annotation", dcp::ContentKind::FEATURE);
 
 	vector<dcp::Rating> ratings;
 	ratings.push_back (dcp::Rating("http://www.mpaa.org/2003-ratings", "PG-13"));
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (cpl_ratings)
 	shared_ptr<dcp::Reel> reel(new dcp::Reel());
 	cpl.add (reel);
 
-	cpl.write_xml ("build/test/cpl_ratings.xml", dcp::SMPTE, std::shared_ptr<dcp::CertificateChain>());
+	cpl.write_xml ("build/test/cpl_ratings.xml", dcp::Standard::SMPTE, {});
 
 	vector<string> ignore;
 	ignore.push_back ("Id");
@@ -96,6 +96,6 @@ BOOST_AUTO_TEST_CASE (cpl_ratings)
 		);
 
 	dcp::CPL cpl2 ("build/test/cpl_ratings.xml");
-	vector<dcp::Rating> ratings2 = cpl2.ratings ();
+	auto ratings2 = cpl2.ratings ();
 	BOOST_TEST(ratings == ratings2);
 }
diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc
index 60945aae..65f01900 100644
--- a/test/cpl_sar_test.cc
+++ b/test/cpl_sar_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -40,6 +40,7 @@
 
 using std::string;
 using std::shared_ptr;
+using std::make_shared;
 
 static void
 check (shared_ptr<dcp::ReelMonoPictureAsset> pa, dcp::Fraction far, string sar)
@@ -47,7 +48,7 @@ check (shared_ptr<dcp::ReelMonoPictureAsset> pa, dcp::Fraction far, string sar)
 	pa->set_screen_aspect_ratio (far);
 	xmlpp::Document doc;
 	xmlpp::Element* el = doc.create_root_node ("Test");
-	pa->write_to_cpl (el, dcp::INTEROP);
+	pa->write_to_cpl (el, dcp::Standard::INTEROP);
 
 	cxml::Node node (el);
 	BOOST_CHECK_EQUAL (node.node_child("MainPicture")->string_child ("ScreenAspectRatio"), sar);
@@ -60,11 +61,8 @@ check (shared_ptr<dcp::ReelMonoPictureAsset> pa, dcp::Fraction far, string sar)
  */
 BOOST_AUTO_TEST_CASE (cpl_sar)
 {
-	shared_ptr<dcp::ReelMonoPictureAsset> pa (
-		new dcp::ReelMonoPictureAsset (
-			shared_ptr<dcp::MonoPictureAsset> (new dcp::MonoPictureAsset ("test/ref/DCP/dcp_test1/video.mxf")),
-			0
-			)
+	auto pa = make_shared<dcp::ReelMonoPictureAsset>(
+		make_shared<dcp::MonoPictureAsset>("test/ref/DCP/dcp_test1/video.mxf"), 0
 		);
 
 	/* Easy ones */
diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 1a78bfd2..da9d3000 100644
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -46,6 +46,7 @@ using std::list;
 using std::string;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
+using std::make_shared;
 using boost::shared_array;
 
 /** Create a DCP with interop subtitles and check that the font is written and read back correctly */
@@ -59,25 +60,25 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
 	subs->write (directory / "frobozz.xml");
 	check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/font_0.ttf");
 
-	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
-	reel->add (shared_ptr<dcp::ReelAsset> (new dcp::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0)));
+	auto reel = make_shared<dcp::Reel>();
+	reel->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction (24, 1), 24, 0));
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("", dcp::TRAILER));
+	auto cpl = make_shared<dcp::CPL>("", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 
 	dcp.add (cpl);
-	dcp.write_xml (dcp::INTEROP);
+	dcp.write_xml (dcp::Standard::INTEROP);
 
 	dcp::DCP dcp2 (directory);
 	dcp2.read ();
-	shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
-		dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset()
+	auto subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
+		dcp2.cpls()[0]->reels()[0]->main_subtitle()->asset_ref().asset()
 		);
 	BOOST_REQUIRE (subs2);
 	BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1);
 
-	boost::uintmax_t const size = boost::filesystem::file_size ("test/data/dummy.ttf");
-	FILE* f = dcp::fopen_boost ("test/data/dummy.ttf", "rb");
+	auto const size = boost::filesystem::file_size ("test/data/dummy.ttf");
+	auto f = dcp::fopen_boost ("test/data/dummy.ttf", "rb");
 	BOOST_REQUIRE (f);
 	shared_array<uint8_t> ref (new uint8_t[size]);
 	fread (ref.get(), 1, size, f);
@@ -92,29 +93,29 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
 	boost::filesystem::path directory = "build/test/smpte_dcp_font_test";
 	dcp::DCP dcp (directory);
 
-	shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset ());
+	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
 	subs->add_font ("theFontId", dcp::ArrayData("test/data/dummy.ttf"));
 	subs->write (directory / "frobozz.mxf");
 
-	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
-	reel->add (shared_ptr<dcp::ReelAsset> (new dcp::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0)));
+	auto reel = make_shared<dcp::Reel>();
+	reel->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction (24, 1), 24, 0));
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("", dcp::TRAILER));
+	auto cpl = make_shared<dcp::CPL>("", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 
 	dcp.add (cpl);
-	dcp.write_xml (dcp::SMPTE);
+	dcp.write_xml (dcp::Standard::SMPTE);
 
 	dcp::DCP dcp2 (directory);
 	dcp2.read ();
-	shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
+	auto subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
 		dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset()
 		);
 	BOOST_REQUIRE (subs2);
 	BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1);
 
-	boost::uintmax_t const size = boost::filesystem::file_size ("test/data/dummy.ttf");
-	FILE* f = dcp::fopen_boost ("test/data/dummy.ttf", "rb");
+	auto const size = boost::filesystem::file_size ("test/data/dummy.ttf");
+	auto f = dcp::fopen_boost ("test/data/dummy.ttf", "rb");
 	BOOST_REQUIRE (f);
 	shared_array<uint8_t> ref (new uint8_t[size]);
 	fread (ref.get(), 1, size, f);
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index cdcbe495..40030f7b 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 	RNGFixer fixer;
 
 	make_simple("build/test/DCP/dcp_test1")->write_xml(
-		dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP"
+		dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP"
 		);
 
 	/* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 	boost::filesystem::remove_all ("build/test/DCP/dcp_test2");
 	boost::filesystem::create_directories ("build/test/DCP/dcp_test2");
 	dcp::DCP d ("build/test/DCP/dcp_test2");
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::FEATURE);
 	cpl->set_content_version (
 		dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
 		);
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 	cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
 	cpl->set_annotation_text ("A Test DCP");
 
-	shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+	shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE));
 	mp->set_metadata (mxf_meta);
 	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", false);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
@@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 	}
 	picture_writer->finalize ();
 
-	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE));
+	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE));
 	ms->set_metadata (mxf_meta);
 	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", vector<dcp::Channel>());
 
@@ -131,16 +131,14 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
 	sound_writer->finalize ();
 
-	cpl->add (shared_ptr<dcp::Reel> (
-			  new dcp::Reel (
-				  shared_ptr<dcp::ReelStereoPictureAsset> (new dcp::ReelStereoPictureAsset (mp, 0)),
-				  shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0))
-				  )
+	cpl->add (make_shared<dcp::Reel>(
+			  make_shared<dcp::ReelStereoPictureAsset>(mp, 0),
+			  make_shared<dcp::ReelSoundAsset>(ms, 0)
 			  ));
 
 	d.add (cpl);
 
-	d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
+	d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
 
 	/* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */
 }
@@ -200,7 +198,7 @@ test_rewriting_sound(string name, bool modify)
 	reel->add(make_shared<dcp::ReelMonoPictureAsset>(make_shared<dcp::MonoPictureAsset>(path("build") / "test" / name / picture), 0));
 
 	auto reader = A_sound->asset()->start_read();
-	auto sound = make_shared<dcp::SoundAsset>(A_sound->asset()->edit_rate(), A_sound->asset()->sampling_rate(), A_sound->asset()->channels(), dcp::LanguageTag("en-US"), dcp::SMPTE);
+	auto sound = make_shared<dcp::SoundAsset>(A_sound->asset()->edit_rate(), A_sound->asset()->sampling_rate(), A_sound->asset()->channels(), dcp::LanguageTag("en-US"), dcp::Standard::SMPTE);
 	auto writer = sound->start_write(path("build") / "test" / name / "pcm_8246f87f-e1df-4c42-a290-f3b3069ff021.mxf", {});
 
 	bool need_to_modify = modify;
@@ -229,11 +227,11 @@ test_rewriting_sound(string name, bool modify)
 	reel->add(make_shared<dcp::ReelSoundAsset>(sound, 0));
 	reel->add(simple_markers());
 
-	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 
 	B.add (cpl);
-	B.write_xml (dcp::SMPTE);
+	B.write_xml (dcp::Standard::SMPTE);
 
 	dcp::EqualityOptions eq;
 	eq.reel_hashes_can_differ = true;
@@ -272,7 +270,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 	boost::filesystem::remove_all ("build/test/DCP/dcp_test5");
 	boost::filesystem::create_directories ("build/test/DCP/dcp_test5");
 	dcp::DCP d ("build/test/DCP/dcp_test5");
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::FEATURE);
 	cpl->set_content_version (
 		dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
 		);
@@ -281,7 +279,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 	cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
 	cpl->set_annotation_text ("A Test DCP");
 
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_metadata (mxf_meta);
 	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test5/video.mxf", false);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
@@ -290,7 +288,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 	}
 	picture_writer->finalize ();
 
-	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE));
+	auto ms = make_shared<dcp::SoundAsset>(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE);
 	ms->set_metadata (mxf_meta);
 	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf", vector<dcp::Channel>());
 
@@ -325,7 +323,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 
 	d.add (cpl);
 
-	d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
+	d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
 
 	/* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */
 }
@@ -350,7 +348,7 @@ BOOST_AUTO_TEST_CASE (dcp_test7)
 	RNGFixer fix;
 
 	make_simple("build/test/DCP/dcp_test7")->write_xml(
-		dcp::INTEROP,  "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
+		dcp::Standard::INTEROP, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
 		);
 
 	/* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */
diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc
index 504e9fd1..4b529be6 100644
--- a/test/dcp_time_test.cc
+++ b/test/dcp_time_test.cc
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (dcp_time)
 	BOOST_CHECK_EQUAL (t.s, 34);
 	BOOST_CHECK_EQUAL (t.m, 18);
 	BOOST_CHECK_EQUAL (t.h, 11);
-	BOOST_CHECK_EQUAL (t.as_string(dcp::INTEROP), "11:18:34:073");
+	BOOST_CHECK_EQUAL (t.as_string(dcp::Standard::INTEROP), "11:18:34:073");
 
 	/* Use a tcr of 24 so that the editable event is a frame */
 	dcp::Time a (3, 2, 3, 4, 24);
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (dcp_time)
 	BOOST_CHECK_EQUAL (r.m, 58);
 	BOOST_CHECK_EQUAL (r.s, 58);
 	BOOST_CHECK_EQUAL (r.e, 23);
-	BOOST_CHECK_EQUAL (r.as_string(dcp::INTEROP), "00:58:58:023");
+	BOOST_CHECK_EQUAL (r.as_string(dcp::Standard::INTEROP), "00:58:58:023");
 
 	/* Different tcr (25) */
 	a = dcp::Time (1, 58, 56, 2, 25);
@@ -68,8 +68,8 @@ BOOST_AUTO_TEST_CASE (dcp_time)
 	BOOST_CHECK_EQUAL (r.m, 6);
 	BOOST_CHECK_EQUAL (r.s, 8);
 	BOOST_CHECK_EQUAL (r.e, 3);
-	BOOST_CHECK_EQUAL (r.as_string(dcp::INTEROP), "03:06:08:003");
-	BOOST_CHECK_EQUAL (r.as_string(dcp::SMPTE), "03:06:08:03");
+	BOOST_CHECK_EQUAL (r.as_string(dcp::Standard::INTEROP), "03:06:08:003");
+	BOOST_CHECK_EQUAL (r.as_string(dcp::Standard::SMPTE), "03:06:08:03");
 
 	/* Another arbitrary tcr (30) */
 	a = dcp::Time (24, 12, 6, 3, 30);
diff --git a/test/effect_test.cc b/test/effect_test.cc
index bcc03211..3be4b8f9 100644
--- a/test/effect_test.cc
+++ b/test/effect_test.cc
@@ -38,14 +38,14 @@
 /** Very simple tests of Effect-related stuff */
 BOOST_AUTO_TEST_CASE (effect_test)
 {
-	BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::NONE), "none");
-	BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::BORDER), "border");
-	BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::SHADOW), "shadow");
+	BOOST_CHECK_EQUAL (dcp::effect_to_string(dcp::Effect::NONE), "none");
+	BOOST_CHECK_EQUAL (dcp::effect_to_string(dcp::Effect::BORDER), "border");
+	BOOST_CHECK_EQUAL (dcp::effect_to_string(dcp::Effect::SHADOW), "shadow");
 
-	BOOST_CHECK_THROW (dcp::effect_to_string ((dcp::Effect) 42), dcp::MiscError);
+	BOOST_CHECK_THROW (dcp::effect_to_string((dcp::Effect) 42), dcp::MiscError);
 
-	BOOST_CHECK_EQUAL (dcp::string_to_effect ("none"), dcp::NONE);
-	BOOST_CHECK_EQUAL (dcp::string_to_effect ("border"), dcp::BORDER);
-	BOOST_CHECK_EQUAL (dcp::string_to_effect ("shadow"), dcp::SHADOW);
-	BOOST_CHECK_THROW (dcp::string_to_effect ("fish"), dcp::ReadError);
+	BOOST_CHECK_EQUAL (dcp::string_to_effect("none"), dcp::Effect::NONE);
+	BOOST_CHECK_EQUAL (dcp::string_to_effect("border"), dcp::Effect::BORDER);
+	BOOST_CHECK_EQUAL (dcp::string_to_effect("shadow"), dcp::Effect::SHADOW);
+	BOOST_CHECK_THROW (dcp::string_to_effect("fish"), dcp::ReadError);
 }
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 0cba37fc..becd1df7 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -82,11 +82,11 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem")));
 	signer->set_key (dcp::file_to_string ("test/ref/crypt/leaf.key"));
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::ContentKind::FEATURE));
 
 	dcp::Key key;
 
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE));
 	mp->set_metadata (mxf_metadata);
 	mp->set_key (key);
 
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	}
 	writer->finalize ();
 
-	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE));
+	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE));
 	ms->set_metadata (mxf_metadata);
 	ms->set_key (key);
 	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf", vector<dcp::Channel>());
@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 
 	d.add (cpl);
 
-	d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp", signer);
+	d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp", signer);
 
 	dcp::DecryptedKDM kdm (
 		cpl,
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 		"2012-07-17T04:45:18+00:00"
 		);
 
-	kdm.encrypt (signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, true, 0).as_xml ("build/test/encryption_test.kdm.xml");
+	kdm.encrypt (signer, signer->leaf(), vector<string>(), dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0).as_xml("build/test/encryption_test.kdm.xml");
 
 	int r = system (
 		"xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/encryption_test.kdm.xml "
diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index e01181d1..4388cbc0 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -39,6 +39,7 @@
 
 using std::string;
 using std::shared_ptr;
+using std::make_shared;
 
 static void
 check (unsigned int* seed, shared_ptr<dcp::PictureAssetWriter> writer, string hash)
@@ -59,8 +60,8 @@ check (unsigned int* seed, shared_ptr<dcp::PictureAssetWriter> writer, string ha
 /** Test the hashing of data written to JPEG2000 MXFs with some random inputs */
 BOOST_AUTO_TEST_CASE (frame_info_hash_test)
 {
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
-	shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/frame_info_hash_test.mxf", false);
+	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto writer = mp->start_write ("build/test/frame_info_hash_test.mxf", false);
 
 	unsigned int seed = 42;
 
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index 6e0dcb67..506f6c43 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -163,7 +163,7 @@ kdm_forensic_test (cxml::Document& doc, bool picture, optional<int> audio)
 	signer->set_key(dcp::file_to_string("test/data/private.key"));
 
 	dcp::EncryptedKDM kdm = decrypted.encrypt (
-		signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, picture, audio
+		signer, signer->leaf(), vector<string>(), dcp::Formulation::MODIFIED_TRANSITIONAL_1, picture, audio
 		);
 
 	/* Check that we can pass this through correctly */
@@ -237,14 +237,14 @@ BOOST_AUTO_TEST_CASE (validity_period_test1)
 	auto signer = make_shared<dcp::CertificateChain>(dcp::file_to_string("test/data/certificate_chain"));
 	signer->set_key(dcp::file_to_string("test/data/private.key"));
 
-	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::SMPTE);
+	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	asset->set_key (dcp::Key());
 	auto writer = asset->start_write ("build/test/validity_period_test1.mxf", false);
 	dcp::ArrayData frame ("test/data/flat_red.j2c");
 	writer->write (frame.data(), frame.size());
 	auto reel = make_shared<dcp::Reel>();
 	reel->add(make_shared<dcp::ReelMonoPictureAsset>(asset, 0));
-	auto cpl = make_shared<dcp::CPL>("test", dcp::FEATURE);
+	auto cpl = make_shared<dcp::CPL>("test", dcp::ContentKind::FEATURE);
 	cpl->add(reel);
 
 	/* This certificate_chain is valid from 26/12/2012 to 24/12/2022 */
@@ -253,14 +253,14 @@ BOOST_AUTO_TEST_CASE (validity_period_test1)
 	BOOST_CHECK_NO_THROW(
 		dcp::DecryptedKDM(
 			cpl, dcp::Key(dcp::file_to_string("test/data/private.key")), dcp::LocalTime("2015-01-01T00:00:00"), dcp::LocalTime("2017-07-31T00:00:00"), "", "", ""
-			).encrypt(signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, true, optional<int>())
+			).encrypt(signer, signer->leaf(), vector<string>(), dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, optional<int>())
 		);
 
 	/* Starts too early */
 	BOOST_CHECK_THROW(
 		dcp::DecryptedKDM(
 			cpl, dcp::Key(dcp::file_to_string("test/data/private.key")), dcp::LocalTime("1981-01-01T00:00:00"), dcp::LocalTime("2017-07-31T00:00:00"), "", "", ""
-			).encrypt(signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, true, optional<int>()),
+			).encrypt(signer, signer->leaf(), vector<string>(), dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, optional<int>()),
 		dcp::BadKDMDateError
 		);
 
@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE (validity_period_test1)
 	BOOST_CHECK_THROW(
 		dcp::DecryptedKDM(
 			cpl, dcp::Key(dcp::file_to_string("test/data/private.key")), dcp::LocalTime("2015-01-01T00:00:00"), dcp::LocalTime("2035-07-31T00:00:00"), "", "", ""
-			).encrypt(signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, true, optional<int>()),
+			).encrypt(signer, signer->leaf(), vector<string>(), dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, optional<int>()),
 		dcp::BadKDMDateError
 		);
 
@@ -276,7 +276,7 @@ BOOST_AUTO_TEST_CASE (validity_period_test1)
 	BOOST_CHECK_THROW(
 		dcp::DecryptedKDM(
 			cpl, dcp::Key(dcp::file_to_string("test/data/private.key")), dcp::LocalTime("1981-01-01T00:00:00"), dcp::LocalTime("2035-07-31T00:00:00"), "", "", ""
-			).encrypt(signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, true, optional<int>()),
+			).encrypt(signer, signer->leaf(), vector<string>(), dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, optional<int>()),
 		dcp::BadKDMDateError
 		);
 }
diff --git a/test/markers_test.cc b/test/markers_test.cc
index 07ba5a80..217900c0 100644
--- a/test/markers_test.cc
+++ b/test/markers_test.cc
@@ -45,7 +45,7 @@ using std::make_shared;
 
 BOOST_AUTO_TEST_CASE (markers_write_test)
 {
-	dcp::CPL cpl("Markers test", dcp::TEST);
+	dcp::CPL cpl("Markers test", dcp::ContentKind::TEST);
 
 	auto asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 432000, 0);
 	asset->set (dcp::Marker::FFOC, dcp::Time(1, 1, 9, 16, 24));
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (markers_write_test)
 
 	cpl.add (reel);
 
-	cpl.write_xml ("build/test/markers_test.xml", dcp::SMPTE, shared_ptr<dcp::CertificateChain>());
+	cpl.write_xml ("build/test/markers_test.xml", dcp::Standard::SMPTE, {});
 }
 
 static void
diff --git a/test/mca_test.cc b/test/mca_test.cc
index faff3439..8467b49a 100644
--- a/test/mca_test.cc
+++ b/test/mca_test.cc
@@ -62,13 +62,13 @@ BOOST_AUTO_TEST_CASE (parse_mca_descriptors_from_mxf_test)
 		reel->add (black_picture_asset(dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1", i), 24));
 		reel->add (reel_sound_asset);
 
-		dcp::CPL cpl("", dcp::FEATURE);
+		dcp::CPL cpl("", dcp::ContentKind::FEATURE);
 		cpl.add (reel);
 		cpl.set_main_sound_configuration("51/L,R,C,LFE,Ls,Rs");
 		cpl.set_main_sound_sample_rate(48000);
 		cpl.set_main_picture_stored_area(dcp::Size(1998, 1080));
 		cpl.set_main_picture_active_area(dcp::Size(1998, 1080));
-		cpl.write_xml (dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i), dcp::SMPTE, shared_ptr<dcp::CertificateChain>());
+		cpl.write_xml (dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i), dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
 
 		cxml::Document ref("CompositionPlaylist", private_test / dcp::String::compose("51_sound_with_mca_%1.cpl", i));
 		cxml::Document check("CompositionPlaylist", dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i));
@@ -91,14 +91,14 @@ BOOST_AUTO_TEST_CASE (parse_mca_descriptors_from_mxf_test)
 /** Reproduce the MCA tags from one of the example files using libdcp */
 BOOST_AUTO_TEST_CASE (write_mca_descriptors_to_mxf_test)
 {
-	shared_ptr<dcp::SoundAsset> sound_asset(new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 6, dcp::LanguageTag("en-US"), dcp::SMPTE));
+	shared_ptr<dcp::SoundAsset> sound_asset(new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 6, dcp::LanguageTag("en-US"), dcp::Standard::SMPTE));
 	vector<dcp::Channel> channels;
-	channels.push_back (dcp::LEFT);
-	channels.push_back (dcp::RIGHT);
-	channels.push_back (dcp::CENTRE);
-	channels.push_back (dcp::LFE);
-	channels.push_back (dcp::LS);
-	channels.push_back (dcp::RS);
+	channels.push_back (dcp::Channel::LEFT);
+	channels.push_back (dcp::Channel::RIGHT);
+	channels.push_back (dcp::Channel::CENTRE);
+	channels.push_back (dcp::Channel::LFE);
+	channels.push_back (dcp::Channel::LS);
+	channels.push_back (dcp::Channel::RS);
 	shared_ptr<dcp::SoundAssetWriter> writer = sound_asset->start_write("build/test/write_mca_descriptors_to_mxf_test.mxf", channels);
 
 	float* samples[6];
@@ -122,13 +122,13 @@ BOOST_AUTO_TEST_CASE (write_mca_descriptors_to_mxf_test)
 	reel->add (black_picture_asset("build/test/write_mca_descriptors_to_mxf_test", 24));
 	reel->add (reel_sound_asset);
 
-	dcp::CPL cpl("", dcp::FEATURE);
+	dcp::CPL cpl("", dcp::ContentKind::FEATURE);
 	cpl.add (reel);
 	cpl.set_main_sound_configuration("51/L,R,C,LFE,Ls,Rs");
 	cpl.set_main_sound_sample_rate(48000);
 	cpl.set_main_picture_stored_area(dcp::Size(1998, 1080));
 	cpl.set_main_picture_active_area(dcp::Size(1998, 1080));
-	cpl.write_xml ("build/test/write_mca_descriptors_to_mxf_test/cpl.xml", dcp::SMPTE, shared_ptr<dcp::CertificateChain>());
+	cpl.write_xml ("build/test/write_mca_descriptors_to_mxf_test/cpl.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
 
 	cxml::Document ref("CompositionPlaylist", private_test / "51_sound_with_mca_1.cpl");
 	cxml::Document check("CompositionPlaylist", "build/test/write_mca_descriptors_to_mxf_test/cpl.xml");
diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
index c529e5ea..9c545091 100644
--- a/test/read_dcp_test.cc
+++ b/test/read_dcp_test.cc
@@ -50,9 +50,9 @@ BOOST_AUTO_TEST_CASE (read_dcp_test1)
 
 	BOOST_REQUIRE (cpls[0]->annotation_text());
 	BOOST_CHECK_EQUAL (cpls[0]->annotation_text().get(), "A Test DCP");
-	BOOST_CHECK_EQUAL (cpls[0]->content_kind(), dcp::TRAILER);
+	BOOST_CHECK_EQUAL (cpls[0]->content_kind(), dcp::ContentKind::TRAILER);
 	BOOST_REQUIRE (d.standard());
-	BOOST_CHECK_EQUAL (d.standard(), dcp::SMPTE);
+	BOOST_CHECK_EQUAL (d.standard(), dcp::Standard::SMPTE);
 }
 
 /** Read an Interop DCP that is in git and make sure that basic stuff is read in correctly */
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (read_dcp_test2)
 
 	BOOST_REQUIRE (cpls[0]->annotation_text());
 	BOOST_CHECK_EQUAL (cpls[0]->annotation_text().get(), "Test_FTR-1_F-119_10_2K_20160524_IOP_OV");
-	BOOST_CHECK_EQUAL (cpls[0]->content_kind(), dcp::FEATURE);
+	BOOST_CHECK_EQUAL (cpls[0]->content_kind(), dcp::ContentKind::FEATURE);
 	BOOST_REQUIRE (d.standard());
-	BOOST_CHECK_EQUAL (d.standard(), dcp::INTEROP);
+	BOOST_CHECK_EQUAL (d.standard(), dcp::Standard::INTEROP);
 }
diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index d37e60d4..48892db5 100644
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -74,12 +74,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 5, 198, 250),
 				   dcp::Time (0, 0, 7, 115, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.15,
-				   dcp::VALIGN_BOTTOM,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::BOTTOM,
+				   dcp::Direction::LTR,
 				   "My jacket was Idi Amin's",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250)
@@ -99,12 +99,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 7, 177, 250),
 				   dcp::Time (0, 0, 11, 31, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.21,
-				   dcp::VALIGN_BOTTOM,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::BOTTOM,
+				   dcp::Direction::LTR,
 				   "My corset was H.M. The Queen's",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250)
@@ -121,12 +121,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 7, 177, 250),
 				   dcp::Time (0, 0, 11, 31, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.15,
-				   dcp::VALIGN_BOTTOM,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::BOTTOM,
+				   dcp::Direction::LTR,
 				   "My large wonderbra",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250)
@@ -146,12 +146,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 11, 94, 250),
 				   dcp::Time (0, 0, 13, 63, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.15,
-				   dcp::VALIGN_BOTTOM,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::BOTTOM,
+				   dcp::Direction::LTR,
 				   "Once belonged to the Shah",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250)
@@ -171,12 +171,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 13, 104, 250),
 				   dcp::Time (0, 0, 15, 177, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.15,
-				   dcp::VALIGN_BOTTOM,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::BOTTOM,
+				   dcp::Direction::LTR,
 				   "And these are Roy Hattersley's jeans",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250)
@@ -202,12 +202,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 41, 62, 250),
 				   dcp::Time (0, 0, 43, 52, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "At afternoon tea with John Peel",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
@@ -224,12 +224,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 41, 62, 250),
 				   dcp::Time (0, 0, 43, 52, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "I enquired if his accent was real",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
@@ -249,12 +249,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 50, 42, 250),
 				   dcp::Time (0, 0, 52, 21, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "He said \"out of the house",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
@@ -271,12 +271,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 50, 42, 250),
 				   dcp::Time (0, 0, 52, 21, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "I'm incredibly scouse",
-				   dcp::BORDER,
+				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
@@ -286,25 +286,25 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-				   string ("theFont"),
+				   string("theFont"),
 				   true,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 2, 208, 250),
-				   dcp::Time (0, 1, 4, 10, 250),
+				   dcp::Time(0, 1, 2, 208, 250),
+				   dcp::Time(0, 1, 4, 10, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "At home it depends how I feel.\"",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -312,21 +312,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   true,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 2, 208, 250),
-				   dcp::Time (0, 1, 4, 10, 250),
+				   dcp::Time(0, 1, 2, 208, 250),
+				   dcp::Time(0, 1, 4, 10, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "I spent a long weekend in Brighton",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
@@ -337,21 +337,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   true,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 15, 42, 250),
-				   dcp::Time (0, 1, 16, 42, 250),
+				   dcp::Time(0, 1, 15, 42, 250),
+				   dcp::Time(0, 1, 16, 42, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_RTL,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::RTL,
 				   "With the legendary Miss Enid Blyton",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -359,21 +359,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   true,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 15, 42, 250),
-				   dcp::Time (0, 1, 16, 42, 250),
+				   dcp::Time(0, 1, 15, 42, 250),
+				   dcp::Time(0, 1, 16, 42, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_TTB,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::TTB,
 				   "She said \"you be Noddy",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
@@ -384,21 +384,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   true,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 27, 115, 250),
-				   dcp::Time (0, 1, 28, 208, 250),
+				   dcp::Time(0, 1, 27, 115, 250),
+				   dcp::Time(0, 1, 28, 208, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_BTT,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::BTT,
 				   "That curious creature the Sphinx",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -406,21 +406,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   true,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 27, 115, 250),
-				   dcp::Time (0, 1, 28, 208, 250),
+				   dcp::Time(0, 1, 27, 115, 250),
+				   dcp::Time(0, 1, 28, 208, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "Is smarter than anyone thinks",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
@@ -437,15 +437,15 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 1, 42, 229, 250),
 				   dcp::Time (0, 1, 45, 62, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "It sits there and smirks",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -459,40 +459,40 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 1, 42, 229, 250),
 				   dcp::Time (0, 1, 45, 62, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "And you don't think it works",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-				   string ("theFont"),
+				   string("theFont"),
 				   false,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 45, 146, 250),
-				   dcp::Time (0, 1, 47, 94, 250),
+				   dcp::Time(0, 1, 45, 146, 250),
+				   dcp::Time(0, 1, 47, 94, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "Then when you're not looking, it winks.",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -506,15 +506,15 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 1, 45, 146, 250),
 				   dcp::Time (0, 1, 47, 94, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "When it snows you will find Sister Sledge",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
@@ -525,21 +525,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   false,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 47, 146, 250),
-				   dcp::Time (0, 1, 48, 167, 250),
+				   dcp::Time(0, 1, 47, 146, 250),
+				   dcp::Time(0, 1, 48, 167, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "Out mooning, at night, on the ledge",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -547,21 +547,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   false,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 1, 47, 146, 250),
-				   dcp::Time (0, 1, 48, 167, 250),
+				   dcp::Time(0, 1, 47, 146, 250),
+				   dcp::Time(0, 1, 48, 167, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "One storey down",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
@@ -578,15 +578,15 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 2, 5, 208, 250),
 				   dcp::Time (0, 2, 7, 31, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.89,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "HELLO",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -594,21 +594,21 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   true,
 				   false,
 				   false,
-				   dcp::Colour (255, 255, 255),
+				   dcp::Colour(255, 255, 255),
 				   42,
 				   1.0,
-				   dcp::Time (0, 2, 5, 208, 250),
-				   dcp::Time (0, 2, 7, 31, 250),
+				   dcp::Time(0, 2, 5, 208, 250),
+				   dcp::Time(0, 2, 7, 31, 250),
 				   0,
-				   dcp::HALIGN_CENTER,
+				   dcp::HAlign::CENTER,
 				   0.95,
-				   dcp::VALIGN_TOP,
-				   dcp::DIRECTION_LTR,
+				   dcp::VAlign::TOP,
+				   dcp::Direction::LTR,
 				   "WORLD",
-				   dcp::BORDER,
-				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0, 250),
-				   dcp::Time (0, 0, 0, 0, 250)
+				   dcp::Effect::BORDER,
+				   dcp::Colour(0, 0, 0),
+				   dcp::Time(0, 0, 0, 0, 250),
+				   dcp::Time(0, 0, 0, 0, 250)
 				   ));
 }
 
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index dcaecb14..59e477a3 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -40,6 +40,7 @@
 
 using std::string;
 using std::shared_ptr;
+using std::make_shared;
 
 /** Check that recovery from a partially-written MXF works */
 BOOST_AUTO_TEST_CASE (recovery)
@@ -51,7 +52,7 @@ BOOST_AUTO_TEST_CASE (recovery)
 
 	boost::filesystem::remove_all ("build/test/baz");
 	boost::filesystem::create_directories ("build/test/baz");
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE));
 	shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/baz/video1.mxf", false);
 
 	int written_size = 0;
@@ -80,7 +81,7 @@ BOOST_AUTO_TEST_CASE (recovery)
 	Kumu::ResetTestRNG ();
 #endif
 
-	mp.reset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+	mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	writer = mp->start_write ("build/test/baz/video2.mxf", true);
 
 	writer->write (data.data(), data.size());
diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc
index af79b1e3..54f6174c 100644
--- a/test/rgb_xyz_test.cc
+++ b/test/rgb_xyz_test.cc
@@ -43,6 +43,7 @@ using std::list;
 using std::string;
 using std::cout;
 using std::shared_ptr;
+using std::make_shared;
 using boost::optional;
 using boost::scoped_array;
 
@@ -64,7 +65,7 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test)
 		}
 	}
 
-	shared_ptr<dcp::OpenJPEGImage> xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz ());
+	auto xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz());
 
 	for (int y = 0; y < size.height; ++y) {
 		uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get() + y * size.width * 6);
@@ -124,14 +125,14 @@ static list<string> notes;
 static void
 note_handler (dcp::NoteType n, string s)
 {
-	BOOST_REQUIRE_EQUAL (n, dcp::DCP_NOTE);
+	BOOST_REQUIRE_EQUAL (n, dcp::NoteType::NOTE);
 	notes.push_back (s);
 }
 
 /** Check that xyz_to_rgb clamps XYZ values correctly */
 BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 {
-	shared_ptr<dcp::OpenJPEGImage> xyz (new dcp::OpenJPEGImage (dcp::Size (2, 2)));
+	auto xyz = make_shared<dcp::OpenJPEGImage>(dcp::Size(2, 2));
 
 	xyz->data(0)[0] = -4;
 	xyz->data(0)[1] = 6901;
@@ -155,7 +156,7 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 
 	/* The 6 out-of-range samples should have been noted */
 	BOOST_REQUIRE_EQUAL (notes.size(), 6);
-	list<string>::const_iterator i = notes.begin ();
+	auto i = notes.begin ();
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
@@ -167,7 +168,7 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 	   as inputs at the extremes (0 and 4095).
 	*/
 
-	uint16_t* buffer = reinterpret_cast<uint16_t*> (rgb.get ());
+	auto buffer = reinterpret_cast<uint16_t*> (rgb.get ());
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 0], buffer[2 * 3 + 1]);
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 1], buffer[2 * 3 + 1]);
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 2], buffer[2 * 3 + 2]);
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index f730485b..a9037114 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	boost::filesystem::path work_dir = "build/test/round_trip_test";
 	boost::filesystem::create_directory (work_dir);
 
-	shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+	shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE));
 	shared_ptr<dcp::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", false);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	asset_A->set_key (key);
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::ContentKind::FEATURE));
 	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
 	reel->add (shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (asset_A, 0)));
 	cpl->add (reel);
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	boost::filesystem::path const kdm_file = work_dir / "kdm.xml";
 
-	kdm_A.encrypt(signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, true, 0).as_xml (kdm_file);
+	kdm_A.encrypt(signer, signer->leaf(), vector<string>(), dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0).as_xml (kdm_file);
 
 	/* Reload the KDM, using our private key to decrypt it */
 	dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key().get ());
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 6f72511e..2af76696 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -34,34 +34,33 @@
 #include <boost/test/unit_test.hpp>
 #include "smpte_subtitle_asset.h"
 
+using std::make_shared;
 using std::string;
-using boost::optional;
 using std::shared_ptr;
+using boost::optional;
 
 BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 {
 	dcp::SMPTESubtitleAsset subs;
 	subs.add(
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString(
-				optional<string>(),
-				false, false, false,
-				dcp::Colour(),
-				64,
-				1,
-				dcp::Time(0, 1, 2, 3, 24),
-				dcp::Time(0, 2, 2, 3, 24),
-				0.5,
-				dcp::HALIGN_CENTER,
-				0.5,
-				dcp::VALIGN_CENTER,
-				dcp::DIRECTION_LTR,
-				"Hello",
-				dcp::NONE,
-				dcp::Colour(),
-				dcp::Time(0, 0, 0, 0, 24),
-				dcp::Time(0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleString>(
+			optional<string>(),
+			false, false, false,
+			dcp::Colour(),
+			64,
+			1,
+			dcp::Time(0, 1, 2, 3, 24),
+			dcp::Time(0, 2, 2, 3, 24),
+			0.5,
+			dcp::HAlign::CENTER,
+			0.5,
+			dcp::VAlign::CENTER,
+			dcp::Direction::LTR,
+			"Hello",
+			dcp::Effect::NONE,
+			dcp::Colour(),
+			dcp::Time(0, 0, 0, 0, 24),
+			dcp::Time(0, 0, 0, 0, 24)
 			)
 		);
 	subs.write("build/test/smpte_subtitle_id_test.mxf");
diff --git a/test/sync_test.cc b/test/sync_test.cc
index cbfd7400..3d6570b7 100644
--- a/test/sync_test.cc
+++ b/test/sync_test.cc
@@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE (sync_test2)
 {
 	/* Make a MXF with the same ID as atmos_pcm.mxf and write a frame of random stuff */
 	int const channels = 14;
-	dcp::SoundAsset asset (dcp::Fraction(24, 1), 48000, channels, dcp::LanguageTag("en-GB"), dcp::SMPTE);
+	dcp::SoundAsset asset (dcp::Fraction(24, 1), 48000, channels, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE);
 	asset._id = "e004046e09234f90a4ae4355e7e83506";
 	boost::system::error_code ec;
 	boost::filesystem::remove ("build/test/foo.mxf", ec);
diff --git a/test/test.cc b/test/test.cc
index 91ecfcf7..196827fc 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -264,7 +264,7 @@ simple_picture (boost::filesystem::path path, string suffix, int frames)
 	mxf_meta.product_name = "OpenDCP";
 	mxf_meta.product_version = "0.0.25";
 
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE));
 	mp->set_metadata (mxf_meta);
 	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (path / dcp::String::compose("video%1.mxf", suffix), false);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
@@ -283,11 +283,11 @@ simple_sound (boost::filesystem::path path, string suffix, dcp::MXFMetadata mxf_
 	int const channels = 6;
 
 	/* Set a valid language, then overwrite it, so that the language parameter can be badly formed */
-	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), sample_rate, channels, dcp::LanguageTag("en-US"), dcp::SMPTE));
+	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), sample_rate, channels, dcp::LanguageTag("en-US"), dcp::Standard::SMPTE));
 	ms->_language = language;
 	ms->set_metadata (mxf_meta);
 	vector<dcp::Channel> active_channels;
-	active_channels.push_back (dcp::LEFT);
+	active_channels.push_back (dcp::Channel::LEFT);
 	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write (path / dcp::String::compose("audio%1.mxf", suffix), active_channels);
 
 	int const samples_per_frame = sample_rate / 24;
@@ -323,8 +323,8 @@ make_simple (boost::filesystem::path path, int reels, int frames)
 
 	boost::filesystem::remove_all (path);
 	boost::filesystem::create_directories (path);
-	shared_ptr<dcp::DCP> d (new dcp::DCP (path));
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::TRAILER));
+	auto d = make_shared<dcp::DCP>(path);
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
 	cpl->set_annotation_text ("A Test DCP");
 	cpl->set_issuer ("OpenDCP 0.0.25");
 	cpl->set_creator ("OpenDCP 0.0.25");
@@ -369,28 +369,26 @@ make_simple (boost::filesystem::path path, int reels, int frames)
 shared_ptr<dcp::Subtitle>
 simple_subtitle ()
 {
-	return shared_ptr<dcp::Subtitle>(
-		new dcp::SubtitleString(
-			optional<string>(),
-			false,
-			false,
-			false,
-			dcp::Colour(255, 255, 255),
-			42,
-			1,
-			dcp::Time(0, 0, 4, 0, 24),
-			dcp::Time(0, 0, 8, 0, 24),
-			0.5,
-			dcp::HALIGN_CENTER,
-			0.8,
-			dcp::VALIGN_TOP,
-			dcp::DIRECTION_LTR,
-			"Hello world",
-			dcp::NONE,
-			dcp::Colour(255, 255, 255),
-			dcp::Time(),
-			dcp::Time()
-			)
+	return make_shared<dcp::SubtitleString>(
+		optional<string>(),
+		false,
+		false,
+		false,
+		dcp::Colour(255, 255, 255),
+		42,
+		1,
+		dcp::Time(0, 0, 4, 0, 24),
+		dcp::Time(0, 0, 8, 0, 24),
+		0.5,
+		dcp::HAlign::CENTER,
+		0.8,
+		dcp::VAlign::TOP,
+		dcp::Direction::LTR,
+		"Hello world",
+		dcp::Effect::NONE,
+		dcp::Colour(255, 255, 255),
+		dcp::Time(),
+		dcp::Time()
 		);
 }
 
@@ -497,7 +495,7 @@ black_picture_asset (boost::filesystem::path dir, int frames)
 	dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
 	BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
 
-	shared_ptr<dcp::MonoPictureAsset> asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE));
+	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	asset->set_metadata (dcp::MXFMetadata("libdcp", "libdcp", "1.6.4devel"));
 	boost::filesystem::create_directories (dir);
 	shared_ptr<dcp::PictureAssetWriter> writer = asset->start_write (dir / "pic.mxf", true);
diff --git a/test/util_test.cc b/test/util_test.cc
index 21a0d7bc..51a5dab6 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -75,18 +75,18 @@ BOOST_AUTO_TEST_CASE (base64_decode_test)
 /** Test dcp::content_kind_from_string */
 BOOST_AUTO_TEST_CASE (content_kind_test)
 {
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("feature"), dcp::FEATURE);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Feature"), dcp::FEATURE);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("FeaturE"), dcp::FEATURE);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Short"), dcp::SHORT);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("trailer"), dcp::TRAILER);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("test"), dcp::TEST);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("transitional"), dcp::TRANSITIONAL);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("rating"), dcp::RATING);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("teaser"), dcp::TEASER);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("policy"), dcp::POLICY);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("psa"), dcp::PUBLIC_SERVICE_ANNOUNCEMENT);
-	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("advertisement"), dcp::ADVERTISEMENT);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("feature"), dcp::ContentKind::FEATURE);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Feature"), dcp::ContentKind::FEATURE);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("FeaturE"), dcp::ContentKind::FEATURE);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Short"), dcp::ContentKind::SHORT);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("trailer"), dcp::ContentKind::TRAILER);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("test"), dcp::ContentKind::TEST);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("transitional"), dcp::ContentKind::TRANSITIONAL);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("rating"), dcp::ContentKind::RATING);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("teaser"), dcp::ContentKind::TEASER);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("policy"), dcp::ContentKind::POLICY);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("psa"), dcp::ContentKind::PUBLIC_SERVICE_ANNOUNCEMENT);
+	BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("advertisement"), dcp::ContentKind::ADVERTISEMENT);
 }
 
 /** Test dcp::relative_to_root */
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 32550c32..78480956 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -110,13 +110,13 @@ setup (int reference_number, string verify_test_suffix)
 
 static
 shared_ptr<dcp::CPL>
-write_dcp_with_single_asset (path dir, shared_ptr<dcp::ReelAsset> reel_asset, dcp::Standard standard = dcp::SMPTE)
+write_dcp_with_single_asset (path dir, shared_ptr<dcp::ReelAsset> reel_asset, dcp::Standard standard = dcp::Standard::SMPTE)
 {
 	auto reel = make_shared<dcp::Reel>();
 	reel->add (reel_asset);
 	reel->add (simple_markers());
 
-	auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 	auto dcp = make_shared<dcp::DCP>(dir);
 	dcp->add (cpl);
@@ -543,7 +543,7 @@ static
 shared_ptr<dcp::CPL>
 dcp_from_frame (dcp::ArrayData const& frame, path dir)
 {
-	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::SMPTE);
+	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	create_directories (dir);
 	auto writer = asset->start_write (dir / "pic.mxf", true);
 	for (int i = 0; i < 24; ++i) {
@@ -632,7 +632,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_interop_subtitles)
 	copy_file ("test/data/subs1.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-	write_dcp_with_single_asset (dir, reel_asset, dcp::INTEROP);
+	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result ({dir}, {{ dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::INVALID_STANDARD }});
 }
@@ -647,7 +647,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
 	copy_file ("test/data/subs1.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
-	write_dcp_with_single_asset (dir, reel_asset, dcp::INTEROP);
+	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
 	{
 		Editor e (dir / "subs.xml");
@@ -754,7 +754,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
 	reel->add (make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", 16 * 24), 0));
 	reel->add (simple_markers(16 * 24));
 
-	auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
 	cpl->set_main_sound_sample_rate (48000);
@@ -765,7 +765,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
 	dcp::DCP dcp (dir);
 	dcp.add (cpl);
 	dcp.write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -797,7 +797,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 
 	auto reel = make_shared<dcp::Reel>();
 	reel->add (black_picture_asset(dir));
-	auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
 	cpl->set_main_sound_sample_rate (48000);
@@ -810,7 +810,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 	dcp::DCP dcp (dir);
 	dcp.add (cpl);
 	dcp.write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -852,7 +852,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
 
 	auto reel = make_shared<dcp::Reel>();
 	reel->add (black_picture_asset(dir));
-	auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
 	cpl->set_main_sound_sample_rate (48000);
@@ -862,7 +862,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
 	dcp::DCP dcp (dir);
 	dcp.add (cpl);
 	dcp.write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -943,7 +943,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
 	reel->add (reel_sound);
 	reel->add (simple_markers());
 
-	auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 	cpl->_additional_subtitle_languages.push_back("this-is-wrong");
 	cpl->_additional_subtitle_languages.push_back("andso-is-this");
@@ -956,7 +956,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
 	auto dcp = make_shared<dcp::DCP>(dir);
 	dcp->add (cpl);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -985,9 +985,9 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 
 	shared_ptr<dcp::PictureAsset> mp;
 	if (three_d) {
-		mp = make_shared<dcp::StereoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::SMPTE);
+		mp = make_shared<dcp::StereoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
 	} else {
-		mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::SMPTE);
+		mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
 	}
 	auto picture_writer = mp->start_write (dcp_path / "video.mxf", false);
 
@@ -1000,7 +1000,7 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 	picture_writer->finalize ();
 
 	auto d = make_shared<dcp::DCP>(dcp_path);
-	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
 	cpl->set_annotation_text ("A Test DCP");
 	cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
 	cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
@@ -1023,7 +1023,7 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 
 	d->add (cpl);
 	d->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1142,12 +1142,12 @@ add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int en
 			dcp::Time(start_frame, 24, 24),
 			dcp::Time(end_frame, 24, 24),
 			0,
-			dcp::HALIGN_CENTER,
+			dcp::HAlign::CENTER,
 			v_position,
-			dcp::VALIGN_CENTER,
-			dcp::DIRECTION_LTR,
+			dcp::VAlign::CENTER,
+			dcp::Direction::LTR,
 			text,
-			dcp::NONE,
+			dcp::Effect::NONE,
 			dcp::Colour(),
 			dcp::Time(),
 			dcp::Time()
@@ -1270,7 +1270,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 	auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls().front()->reels().front()->add(reel_subs);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1311,7 +1311,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 	}
 
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1365,7 +1365,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 	auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls().front()->reels().front()->add(reel_subs);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1419,7 +1419,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 	auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls().front()->reels().front()->add(reel_subs);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1525,13 +1525,13 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	markers2->set (dcp::Marker::LFOC, dcp::Time(16 * 24 - 1, 24, 24));
 	reel2->add (markers2);
 
-	auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
 	cpl->add (reel1);
 	cpl->add (reel2);
 	auto dcp = make_shared<dcp::DCP>(dir);
 	dcp->add (cpl);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1797,12 +1797,12 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
 	auto reel_sound = make_shared<dcp::ReelSoundAsset>(sound, 0);
 	reel->add (reel_sound);
 	reel->add (simple_markers());
-	auto cpl = make_shared<dcp::CPL>("hello", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
 	cpl->add (reel);
 	auto dcp = make_shared<dcp::DCP>(dir);
 	dcp->add (cpl);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1823,7 +1823,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
 	path const dir("build/test/verify_missing_cpl_annotation_text");
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1854,7 +1854,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
 	path const dir("build/test/verify_mismatched_cpl_annotation_text");
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1884,7 +1884,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 	path const dir("build/test/verify_mismatched_asset_duration");
 	prepare_directory (dir);
 	shared_ptr<dcp::DCP> dcp (new dcp::DCP(dir));
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL("A Test DCP", dcp::TRAILER));
+	shared_ptr<dcp::CPL> cpl (new dcp::CPL("A Test DCP", dcp::ContentKind::TRAILER));
 
 	shared_ptr<dcp::MonoPictureAsset> mp = simple_picture (dir, "", 24);
 	shared_ptr<dcp::SoundAsset> ms = simple_sound (dir, "", dcp::MXFMetadata(), "en-US", 25);
@@ -1899,7 +1899,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 
 	dcp->add (cpl);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -1922,7 +1922,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 {
 	prepare_directory (dir);
 	auto dcp = make_shared<dcp::DCP>(dir);
-	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
 
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
@@ -1963,7 +1963,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 
 	dcp->add (cpl);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2008,7 +2008,7 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
 {
 	prepare_directory (dir);
 	auto dcp = make_shared<dcp::DCP>(dir);
-	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
 
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
@@ -2048,7 +2048,7 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
 
 	dcp->add (cpl);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2092,7 +2092,7 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 {
 	prepare_directory (dir);
 	auto dcp = make_shared<dcp::DCP>(dir);
-	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
 
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
@@ -2115,7 +2115,7 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 
 	dcp->add (cpl);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2174,7 +2174,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
 	path const dir("build/test/verify_missing_hash");
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2208,14 +2208,14 @@ verify_markers_test (
 	)
 {
 	auto dcp = make_simple (dir);
-	dcp->cpls()[0]->set_content_kind (dcp::FEATURE);
+	dcp->cpls()[0]->set_content_kind (dcp::ContentKind::FEATURE);
 	auto markers_asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 24, 0);
 	for (auto const& i: markers) {
 		markers_asset->set (i.first, i.second);
 	}
 	dcp->cpls()[0]->reels()[0]->add(markers_asset);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2317,7 +2317,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
 	auto cpl = dcp->cpls()[0];
 	cpl->unset_version_number();
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2333,7 +2333,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
 	path dir = "build/test/verify_missing_extension_metadata1";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2361,7 +2361,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
 	path dir = "build/test/verify_missing_extension_metadata2";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2389,7 +2389,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata3";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2419,7 +2419,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
 	path dir = "build/test/verify_invalid_extension_metadata1";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2447,7 +2447,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
 	path dir = "build/test/verify_invalid_extension_metadata2";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2475,7 +2475,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata6";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2505,7 +2505,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata7";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2533,7 +2533,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata8";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2563,7 +2563,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
 	path dir = "build/test/verify_invalid_xml_cpl_extension_metadata9";
 	auto dcp = make_simple (dir);
 	dcp->write_xml (
-		dcp::SMPTE,
+		dcp::Standard::SMPTE,
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::String::compose("libdcp %1", dcp::version),
 		dcp::LocalTime().as_string(),
@@ -2683,11 +2683,11 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 	signer->add (dcp::Certificate(dcp::file_to_string("test/ref/crypt/leaf.signed.pem")));
 	signer->set_key (dcp::file_to_string("test/ref/crypt/leaf.key"));
 
-	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::TRAILER);
+	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
 
 	dcp::Key key;
 
-	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::SMPTE);
+	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_key (key);
 
 	auto writer = mp->start_write (dir / "video.mxf", false);
@@ -2723,7 +2723,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 
 	d.add (cpl);
 
-	d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP", signer);
+	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}});
 }
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index fee2d841..10d39f11 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -47,6 +47,7 @@
 using std::string;
 using std::shared_ptr;
 using std::vector;
+using std::make_shared;
 using boost::optional;
 
 /** Test dcp::order::Font::take_intersection */
@@ -96,10 +97,10 @@ BOOST_AUTO_TEST_CASE (take_difference_test)
 /** Test dcp::order::Subtitle::pull_fonts */
 BOOST_AUTO_TEST_CASE (pull_fonts_test1)
 {
-	shared_ptr<dcp::order::Part> root (new dcp::order::Part (shared_ptr<dcp::order::Part> ()));
-	shared_ptr<dcp::order::Subtitle> sub1 (new dcp::order::Subtitle (root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time()));
+	auto root = make_shared<dcp::order::Part>(shared_ptr<dcp::order::Part>());
+	auto sub1 = make_shared<dcp::order::Subtitle>(root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time());
 	root->children.push_back (sub1);
-	shared_ptr<dcp::order::Text> text1 (new dcp::order::Text (sub1, dcp::HALIGN_CENTER, 0, dcp::VALIGN_TOP, 0, dcp::DIRECTION_LTR));
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, dcp::Direction::LTR);
 	sub1->children.push_back (text1);
 	text1->font._values["font"] = "Inconsolata";
 	text1->font._values["size"] = "42";
@@ -118,11 +119,11 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test2)
 	shared_ptr<dcp::order::Part> root (new dcp::order::Part (shared_ptr<dcp::order::Part> ()));
 	shared_ptr<dcp::order::Subtitle> sub1 (new dcp::order::Subtitle (root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time()));
 	root->children.push_back (sub1);
-	shared_ptr<dcp::order::Text> text1 (new dcp::order::Text (sub1, dcp::HALIGN_CENTER, 0, dcp::VALIGN_TOP, 0, dcp::DIRECTION_LTR));
+	shared_ptr<dcp::order::Text> text1 (new dcp::order::Text (sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, dcp::Direction::LTR));
 	sub1->children.push_back (text1);
 	text1->font._values["font"] = "Inconsolata";
 	text1->font._values["size"] = "42";
-	shared_ptr<dcp::order::Text> text2 (new dcp::order::Text (sub1, dcp::HALIGN_CENTER, 0, dcp::VALIGN_TOP, 0, dcp::DIRECTION_LTR));
+	shared_ptr<dcp::order::Text> text2 (new dcp::order::Text (sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, dcp::Direction::LTR));
 	sub1->children.push_back (text2);
 	text2->font._values["font"] = "Inconsolata";
 	text2->font._values["size"] = "48";
@@ -143,7 +144,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test3)
 	shared_ptr<dcp::order::Part> root (new dcp::order::Part (shared_ptr<dcp::order::Part> ()));
 	shared_ptr<dcp::order::Subtitle> sub1 (new dcp::order::Subtitle (root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time()));
 	root->children.push_back (sub1);
-	shared_ptr<dcp::order::Text> text1 (new dcp::order::Text (sub1, dcp::HALIGN_CENTER, 0, dcp::VALIGN_TOP, 0, dcp::DIRECTION_LTR));
+	shared_ptr<dcp::order::Text> text1 (new dcp::order::Text (sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, dcp::Direction::LTR));
 	sub1->children.push_back (text1);
 	dcp::order::Font font;
 	font._values["font"] = "Inconsolata";
@@ -179,12 +180,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 				dcp::Time (0, 4,  9, 22, 24),
 				dcp::Time (0, 4, 11, 22, 24),
 				0,
-				dcp::HALIGN_CENTER,
+				dcp::HAlign::CENTER,
 				0.8,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
+				dcp::VAlign::TOP,
+				dcp::Direction::LTR,
 				"Hello world",
-				dcp::NONE,
+				dcp::Effect::NONE,
 				dcp::Colour (0, 0, 0),
 				dcp::Time (0, 0, 0, 0, 24),
 				dcp::Time (0, 0, 0, 0, 24)
@@ -205,12 +206,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 				dcp::Time (5, 41,  0, 21, 24),
 				dcp::Time (6, 12, 15, 21, 24),
 				0,
-				dcp::HALIGN_CENTER,
+				dcp::HAlign::CENTER,
 				0.4,
-				dcp::VALIGN_BOTTOM,
-				dcp::DIRECTION_LTR,
+				dcp::VAlign::BOTTOM,
+				dcp::Direction::LTR,
 				"What's going on",
-				dcp::BORDER,
+				dcp::Effect::BORDER,
 				dcp::Colour (1, 2, 3),
 				dcp::Time (1, 2, 3, 4, 24),
 				dcp::Time (5, 6, 7, 8, 24)
@@ -265,12 +266,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 				dcp::Time (0, 4,  9, 22, 24),
 				dcp::Time (0, 4, 11, 22, 24),
 				-0.2,
-				dcp::HALIGN_CENTER,
+				dcp::HAlign::CENTER,
 				0.8,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
+				dcp::VAlign::TOP,
+				dcp::Direction::LTR,
 				"Hello world",
-				dcp::NONE,
+				dcp::Effect::NONE,
 				dcp::Colour (0, 0, 0),
 				dcp::Time (0, 0, 0, 0, 24),
 				dcp::Time (0, 0, 0, 0, 24)
@@ -291,12 +292,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 				dcp::Time (5, 41,  0, 21, 24),
 				dcp::Time (6, 12, 15, 21, 24),
 				-0.2,
-				dcp::HALIGN_CENTER,
+				dcp::HAlign::CENTER,
 				0.4,
-				dcp::VALIGN_BOTTOM,
-				dcp::DIRECTION_LTR,
+				dcp::VAlign::BOTTOM,
+				dcp::Direction::LTR,
 				"What's going on",
-				dcp::BORDER,
+				dcp::Effect::BORDER,
 				dcp::Colour (1, 2, 3),
 				dcp::Time (1, 2, 3, 4, 24),
 				dcp::Time (5, 6, 7, 8, 24)
@@ -345,9 +346,9 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 				dcp::Time (0, 4,  9, 22, 24),
 				dcp::Time (0, 4, 11, 22, 24),
 				0,
-				dcp::HALIGN_CENTER,
+				dcp::HAlign::CENTER,
 				0.8,
-				dcp::VALIGN_TOP,
+				dcp::VAlign::TOP,
 				dcp::Time (0, 0, 0, 0, 24),
 				dcp::Time (0, 0, 0, 0, 24)
 				)
@@ -367,20 +368,20 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 	string const creator = "libdcp";
 	string const annotation_text = "Created by libdcp";
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE));
+	auto cpl = make_shared<dcp::CPL>("My film", dcp::ContentKind::FEATURE);
 	cpl->add (reel);
 	cpl->set_issuer (issuer);
 	cpl->set_creator (creator);
 	cpl->set_issue_date (issue_date);
 	cpl->set_annotation_text (annotation_text);
-	optional<dcp::ContentVersion> cv = cpl->content_version();
+	auto cv = cpl->content_version();
 	BOOST_REQUIRE (cv);
 	cv->label_text = "foo";
 	cpl->set_content_version (*cv);
 
 	dcp::DCP dcp ("build/test/write_interop_subtitle_test3");
 	dcp.add (cpl);
-	dcp.write_xml (dcp::INTEROP, issuer, creator, issue_date, annotation_text);
+	dcp.write_xml (dcp::Standard::INTEROP, issuer, creator, issue_date, annotation_text);
 
 	check_xml (
 		dcp::file_to_string("test/ref/write_interop_subtitle_test3/subs.xml"),
@@ -412,54 +413,50 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString (
-				string ("Frutiger"),
-				false,
-				false,
-				false,
-				dcp::Colour (255, 255, 255),
-				48,
-				1.0,
-				dcp::Time (0, 4,  9, 22, 24),
-				dcp::Time (0, 4, 11, 22, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.8,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
-				"Hello world",
-				dcp::NONE,
-				dcp::Colour (0, 0, 0),
-				dcp::Time (0, 0, 0, 0, 24),
-				dcp::Time (0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleString> (
+			string ("Frutiger"),
+			false,
+			false,
+			false,
+			dcp::Colour (255, 255, 255),
+			48,
+			1.0,
+			dcp::Time (0, 4,  9, 22, 24),
+			dcp::Time (0, 4, 11, 22, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.8,
+			dcp::VAlign::TOP,
+			dcp::Direction::LTR,
+			"Hello world",
+			dcp::Effect::NONE,
+			dcp::Colour (0, 0, 0),
+			dcp::Time (0, 0, 0, 0, 24),
+			dcp::Time (0, 0, 0, 0, 24)
 			)
 		);
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString (
-				boost::optional<string> (),
-				true,
-				true,
-				true,
-				dcp::Colour (128, 0, 64),
-				91,
-				1.0,
-				dcp::Time (5, 41,  0, 21, 24),
-				dcp::Time (6, 12, 15, 21, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.4,
-				dcp::VALIGN_BOTTOM,
-				dcp::DIRECTION_RTL,
-				"What's going on",
-				dcp::BORDER,
-				dcp::Colour (1, 2, 3),
-				dcp::Time (1, 2, 3, 4, 24),
-				dcp::Time (5, 6, 7, 8, 24)
-				)
+		make_shared<dcp::SubtitleString>(
+			boost::optional<string> (),
+			true,
+			true,
+			true,
+			dcp::Colour (128, 0, 64),
+			91,
+			1.0,
+			dcp::Time (5, 41,  0, 21, 24),
+			dcp::Time (6, 12, 15, 21, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.4,
+			dcp::VAlign::BOTTOM,
+			dcp::Direction::RTL,
+			"What's going on",
+			dcp::Effect::BORDER,
+			dcp::Colour (1, 2, 3),
+			dcp::Time (1, 2, 3, 4, 24),
+			dcp::Time (5, 6, 7, 8, 24)
 			)
 		);
 
@@ -505,165 +502,153 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString (
-				string ("Arial"),
-				false,
-				false,
-				false,
-				dcp::Colour (255, 255, 255),
-				48,
-				1.0,
-				dcp::Time (0, 0, 1, 0, 24),
-				dcp::Time (0, 0, 9, 0, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.8,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
-				"Testing is ",
-				dcp::NONE,
-				dcp::Colour (0, 0, 0),
-				dcp::Time (0, 0, 0, 0, 24),
-				dcp::Time (0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleString>(
+			string ("Arial"),
+			false,
+			false,
+			false,
+			dcp::Colour (255, 255, 255),
+			48,
+			1.0,
+			dcp::Time (0, 0, 1, 0, 24),
+			dcp::Time (0, 0, 9, 0, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.8,
+			dcp::VAlign::TOP,
+			dcp::Direction::LTR,
+			"Testing is ",
+			dcp::Effect::NONE,
+			dcp::Colour (0, 0, 0),
+			dcp::Time (0, 0, 0, 0, 24),
+			dcp::Time (0, 0, 0, 0, 24)
 			)
 		);
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString (
-				string ("Arial"),
-				true,
-				false,
-				false,
-				dcp::Colour (255, 255, 255),
-				48,
-				1.0,
-				dcp::Time (0, 0, 1, 0, 24),
-				dcp::Time (0, 0, 9, 0, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.8,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
-				"really",
-				dcp::NONE,
-				dcp::Colour (0, 0, 0),
-				dcp::Time (0, 0, 0, 0, 24),
-				dcp::Time (0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleString>(
+			string ("Arial"),
+			true,
+			false,
+			false,
+			dcp::Colour (255, 255, 255),
+			48,
+			1.0,
+			dcp::Time (0, 0, 1, 0, 24),
+			dcp::Time (0, 0, 9, 0, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.8,
+			dcp::VAlign::TOP,
+			dcp::Direction::LTR,
+			"really",
+			dcp::Effect::NONE,
+			dcp::Colour (0, 0, 0),
+			dcp::Time (0, 0, 0, 0, 24),
+			dcp::Time (0, 0, 0, 0, 24)
 			)
 		);
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString (
-				string ("Arial"),
-				false,
-				false,
-				false,
-				dcp::Colour (255, 255, 255),
-				48,
-				1.0,
-				dcp::Time (0, 0, 1, 0, 24),
-				dcp::Time (0, 0, 9, 0, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.8,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
-				" fun",
-				dcp::NONE,
-				dcp::Colour (0, 0, 0),
-				dcp::Time (0, 0, 0, 0, 24),
-				dcp::Time (0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleString>(
+			string ("Arial"),
+			false,
+			false,
+			false,
+			dcp::Colour (255, 255, 255),
+			48,
+			1.0,
+			dcp::Time (0, 0, 1, 0, 24),
+			dcp::Time (0, 0, 9, 0, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.8,
+			dcp::VAlign::TOP,
+			dcp::Direction::LTR,
+			" fun",
+			dcp::Effect::NONE,
+			dcp::Colour (0, 0, 0),
+			dcp::Time (0, 0, 0, 0, 24),
+			dcp::Time (0, 0, 0, 0, 24)
 			)
 		);
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString (
-				string ("Arial"),
-				false,
-				false,
-				false,
-				dcp::Colour (255, 255, 255),
-				48,
-				1.0,
-				dcp::Time (0, 0, 1, 0, 24),
-				dcp::Time (0, 0, 9, 0, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.9,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
-				"This is the ",
-				dcp::NONE,
-				dcp::Colour (0, 0, 0),
-				dcp::Time (0, 0, 0, 0, 24),
-				dcp::Time (0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleString>(
+			string ("Arial"),
+			false,
+			false,
+			false,
+			dcp::Colour (255, 255, 255),
+			48,
+			1.0,
+			dcp::Time (0, 0, 1, 0, 24),
+			dcp::Time (0, 0, 9, 0, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.9,
+			dcp::VAlign::TOP,
+			dcp::Direction::LTR,
+			"This is the ",
+			dcp::Effect::NONE,
+			dcp::Colour (0, 0, 0),
+			dcp::Time (0, 0, 0, 0, 24),
+			dcp::Time (0, 0, 0, 0, 24)
 			)
 		);
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString (
-				string ("Arial"),
-				true,
-				false,
-				false,
-				dcp::Colour (255, 255, 255),
-				48,
-				1.0,
-				dcp::Time (0, 0, 1, 0, 24),
-				dcp::Time (0, 0, 9, 0, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.9,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
-				"second",
-				dcp::NONE,
-				dcp::Colour (0, 0, 0),
-				dcp::Time (0, 0, 0, 0, 24),
-				dcp::Time (0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleString>(
+			string ("Arial"),
+			true,
+			false,
+			false,
+			dcp::Colour (255, 255, 255),
+			48,
+			1.0,
+			dcp::Time (0, 0, 1, 0, 24),
+			dcp::Time (0, 0, 9, 0, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.9,
+			dcp::VAlign::TOP,
+			dcp::Direction::LTR,
+			"second",
+			dcp::Effect::NONE,
+			dcp::Colour (0, 0, 0),
+			dcp::Time (0, 0, 0, 0, 24),
+			dcp::Time (0, 0, 0, 0, 24)
 			)
 		);
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleString (
-				string ("Arial"),
-				false,
-				false,
-				false,
-				dcp::Colour (255, 255, 255),
-				48,
-				1.0,
-				dcp::Time (0, 0, 1, 0, 24),
-				dcp::Time (0, 0, 9, 0, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.9,
-				dcp::VALIGN_TOP,
-				dcp::DIRECTION_LTR,
-				" line",
-				dcp::NONE,
-				dcp::Colour (0, 0, 0),
-				dcp::Time (0, 0, 0, 0, 24),
-				dcp::Time (0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleString>(
+			string ("Arial"),
+			false,
+			false,
+			false,
+			dcp::Colour (255, 255, 255),
+			48,
+			1.0,
+			dcp::Time (0, 0, 1, 0, 24),
+			dcp::Time (0, 0, 9, 0, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.9,
+			dcp::VAlign::TOP,
+			dcp::Direction::LTR,
+			" line",
+			dcp::Effect::NONE,
+			dcp::Colour (0, 0, 0),
+			dcp::Time (0, 0, 0, 0, 24),
+			dcp::Time (0, 0, 0, 0, 24)
 			)
 		);
 
 	c._xml_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
 
 	check_xml (
-		c.xml_as_string (),
+		c.xml_as_string(),
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
 		"<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
 		  "<dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>"
@@ -703,20 +688,18 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 	c.set_content_title_text ("Test");
 
 	c.add (
-		shared_ptr<dcp::Subtitle> (
-			new dcp::SubtitleImage (
-				dcp::ArrayData ("test/data/sub.png"),
-				dcp::Time (0, 4,  9, 22, 24),
-				dcp::Time (0, 4, 11, 22, 24),
-				0,
-				dcp::HALIGN_CENTER,
-				0.8,
-				dcp::VALIGN_TOP,
-				dcp::Time (0, 0, 0, 0, 24),
-				dcp::Time (0, 0, 0, 0, 24)
-				)
+		make_shared<dcp::SubtitleImage>(
+			dcp::ArrayData ("test/data/sub.png"),
+			dcp::Time (0, 4,  9, 22, 24),
+			dcp::Time (0, 4, 11, 22, 24),
+			0,
+			dcp::HAlign::CENTER,
+			0.8,
+			dcp::VAlign::TOP,
+			dcp::Time (0, 0, 0, 0, 24),
+			dcp::Time (0, 0, 0, 0, 24)
 			)
-		);
+	      );
 
 	c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";