Rename TextType::SUBTITLE -> OPEN_SUBTITLE and CAPTION -> CLOSED_CAPTION.

12 files changed, 88 insertions, 88 deletions

diff --git a/src/reel.cc b/src/reel.cc
index fa20cba9..a35216bf 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -356,7 +356,7 @@ Reel::add (shared_ptr<ReelAsset> asset)
 	} else if (auto so = dynamic_pointer_cast<ReelSoundAsset>(asset)) {
 		_main_sound = so;
 	} else if (auto te = dynamic_pointer_cast<ReelTextAsset>(asset)) {
-		if (te->type() == TextType::SUBTITLE) {
+		if (te->type() == TextType::OPEN_SUBTITLE) {
 			_main_subtitle = te;
 		} else {
 			_closed_captions.push_back(te);
diff --git a/src/reel_interop_text_asset.cc b/src/reel_interop_text_asset.cc
index 4e0f45c8..c43cf37b 100644
--- a/src/reel_interop_text_asset.cc
+++ b/src/reel_interop_text_asset.cc
@@ -70,9 +70,9 @@ string
 ReelInteropTextAsset::cpl_node_name() const
 {
 	switch (_type) {
-	case TextType::SUBTITLE:
+	case TextType::OPEN_SUBTITLE:
 		return "MainSubtitle";
-	case TextType::CAPTION:
+	case TextType::CLOSED_CAPTION:
 		return "cc-cpl:MainClosedCaption";
 	}
 
@@ -85,9 +85,9 @@ pair<string, string>
 ReelInteropTextAsset::cpl_node_namespace() const
 {
 	switch (_type) {
-	case TextType::SUBTITLE:
+	case TextType::OPEN_SUBTITLE:
 		return {};
-	case TextType::CAPTION:
+	case TextType::CLOSED_CAPTION:
 		return make_pair("http://www.digicine.com/PROTO-ASDCP-CC-CPL-20070926#", "cc-cpl");
 	}
 
diff --git a/src/reel_smpte_text_asset.cc b/src/reel_smpte_text_asset.cc
index 76efab44..7950dfd2 100644
--- a/src/reel_smpte_text_asset.cc
+++ b/src/reel_smpte_text_asset.cc
@@ -72,9 +72,9 @@ string
 ReelSMPTETextAsset::cpl_node_name() const
 {
 	switch (_type) {
-	case TextType::SUBTITLE:
+	case TextType::OPEN_SUBTITLE:
 		return "MainSubtitle";
-	case TextType::CAPTION:
+	case TextType::CLOSED_CAPTION:
 		return "tt:ClosedCaption";
 	}
 
@@ -87,9 +87,9 @@ pair<string, string>
 ReelSMPTETextAsset::cpl_node_namespace() const
 {
 	switch (_type) {
-	case TextType::SUBTITLE:
+	case TextType::OPEN_SUBTITLE:
 		return {};
-	case TextType::CAPTION:
+	case TextType::CLOSED_CAPTION:
 		return make_pair("http://www.smpte-ra.org/schemas/429-12/2008/TT", "tt");
 	}
 
@@ -102,7 +102,7 @@ xmlpp::Element *
 ReelSMPTETextAsset::write_to_cpl(xmlpp::Element* node, Standard standard) const
 {
 	auto asset = ReelFileAsset::write_to_cpl (node, standard);
-	string const ns = _type == TextType::CAPTION ? "tt" : "";
+	string const ns = _type == TextType::CLOSED_CAPTION ? "tt" : "";
 	if (_language) {
 		cxml::add_child(asset, "Language", ns)->add_child_text(*_language);
 	}
diff --git a/src/reel_text_asset.cc b/src/reel_text_asset.cc
index 09749946..248a2ab3 100644
--- a/src/reel_text_asset.cc
+++ b/src/reel_text_asset.cc
@@ -72,9 +72,9 @@ ReelTextAsset::ReelTextAsset(std::shared_ptr<const cxml::Node> node)
 	: ReelFileAsset (node)
 {
 	if (node->name() == "MainSubtitle") {
-		_type = TextType::SUBTITLE;
+		_type = TextType::OPEN_SUBTITLE;
 	} else if (node->name() == "MainClosedCaption" || node->name() == "ClosedCaption") {
-		_type = TextType::CAPTION;
+		_type = TextType::CLOSED_CAPTION;
 	} else {
 		DCP_ASSERT(false);
 	}
diff --git a/src/text_type.h b/src/text_type.h
index daac36c8..3f4f43c8 100644
--- a/src/text_type.h
+++ b/src/text_type.h
@@ -37,8 +37,8 @@ namespace dcp {
 
 enum class TextType
 {
-	SUBTITLE,
-	CAPTION
+	OPEN_SUBTITLE,
+	CLOSED_CAPTION
 };
 
 
diff --git a/test/combine_test.cc b/test/combine_test.cc
index 569f9d90..dc72d2d4 100644
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -465,10 +465,10 @@ BOOST_AUTO_TEST_CASE(combine_multi_reel_subtitles)
 	subs2->add_font("afont2", data2);
 	subs2->write(in / "subs2" / "subs2.xml");
 
-	auto reel_subs1 = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, subs1, dcp::Fraction(24, 1), 240, 0);
+	auto reel_subs1 = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, subs1, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls()[0]->reels()[0]->add(reel_subs1);
 
-	auto reel_subs2 = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, subs2, dcp::Fraction(24, 1), 240, 0);
+	auto reel_subs2 = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, subs2, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls()[0]->reels()[1]->add(reel_subs2);
 
 	dcp->write_xml();
diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index ffc638d5..fe06a2f8 100644
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
 	check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/font_0.ttf");
 
 	auto reel = make_shared<dcp::Reel>();
-	reel->add(make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction (24, 1), 24, 0));
+	reel->add(make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction (24, 1), 24, 0));
 
 	auto cpl = make_shared<dcp::CPL>("", dcp::ContentKind::TRAILER, dcp::Standard::INTEROP);
 	cpl->add (reel);
@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
 	subs->write (directory / "frobozz.mxf");
 
 	auto reel = make_shared<dcp::Reel>();
-	reel->add(make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction (24, 1), 24, 0));
+	reel->add(make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction (24, 1), 24, 0));
 
 	auto cpl = make_shared<dcp::CPL>("", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 	cpl->add (reel);
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index d811fb3a..3bb62d21 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	auto reel = std::make_shared<dcp::Reel>();
 	auto reel_picture_asset = std::make_shared<dcp::ReelMonoPictureAsset>(picture_asset, 0);
 	auto reel_sound_asset = std::make_shared<dcp::ReelSoundAsset>(sound_asset, 0);
-	auto reel_subs_asset = std::make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs_asset, dcp::Fraction(24, 1), 120, 0);
+	auto reel_subs_asset = std::make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs_asset, dcp::Fraction(24, 1), 120, 0);
 	reel->add(reel_picture_asset);
 	reel->add(reel_sound_asset);
 	reel->add(reel_subs_asset);
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index 59f7daa7..2d7f4a43 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -955,7 +955,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 	c->write ("build/test/write_interop_subtitle_test3/subs.xml");
 
 	auto reel = std::make_shared<dcp::Reel>();
-	reel->add(std::make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, c, dcp::Fraction(24, 1), 6046, 0));
+	reel->add(std::make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, c, dcp::Fraction(24, 1), 6046, 0));
 
 	string const issue_date = "2018-09-02T04:45:18+00:00";
 	string const issuer = "libdcp";
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index d2ae3042..714d195c 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	subs->add_font ("afont", data);
 	subs->write (vf_path / "subs.xml");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 192, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), 192, 0);
 
 	auto reel = make_shared<dcp::Reel>(ov_reel_picture, ov_reel_sound, reel_subs);
 
diff --git a/test/test.cc b/test/test.cc
index b4d51e9c..2cde0776 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -445,7 +445,7 @@ make_simple_with_interop_subs (boost::filesystem::path path)
 	subs->add_font ("afont", data);
 	subs->write (path / "subs" / "subs.xml");
 
-	auto reel_subs = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 240, 0);
+	auto reel_subs = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls().front()->reels().front()->add (reel_subs);
 
 	return dcp;
@@ -466,7 +466,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path)
 
 	subs->write (path / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 192, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), 192, 0);
 	dcp->cpls().front()->reels().front()->add (reel_subs);
 
 	return dcp;
@@ -482,7 +482,7 @@ make_simple_with_interop_ccaps (boost::filesystem::path path)
 	subs->add(simple_text());
 	subs->write (path / "ccap.xml");
 
-	auto reel_caps = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::CAPTION, subs, dcp::Fraction(24, 1), 240, 0);
+	auto reel_caps = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::CLOSED_CAPTION, subs, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls()[0]->reels()[0]->add (reel_caps);
 
 	return dcp;
@@ -502,7 +502,7 @@ make_simple_with_smpte_ccaps (boost::filesystem::path path)
 	subs->add_font("font", fake_font);
 	subs->write (path / "ccap.mxf");
 
-	auto reel_caps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, subs, dcp::Fraction(24, 1), 192, 0);
+	auto reel_caps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, subs, dcp::Fraction(24, 1), 192, 0);
 	dcp->cpls()[0]->reels()[0]->add(reel_caps);
 
 	return dcp;
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 63e2f352..e08dda18 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -1178,7 +1178,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_interop_subtitles)
 	prepare_directory (dir);
 	copy_file ("test/data/subs1.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1204,7 +1204,7 @@ BOOST_AUTO_TEST_CASE(verify_catch_missing_font_file_with_interop_ccap)
 	prepare_directory(dir);
 	copy_file("test/data/subs1.xml", dir / "ccap.xml");
 	auto asset = make_shared<dcp::InteropTextAsset>(dir / "ccap.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::CAPTION, asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::CLOSED_CAPTION, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1232,7 +1232,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
 	prepare_directory (dir);
 	copy_file ("test/data/subs1.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	{
@@ -1273,7 +1273,7 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_no_subtitles)
 	prepare_directory(dir);
 	copy_file("test/data/subs4.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1303,7 +1303,7 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_single_space_subtitle)
 	prepare_directory(dir);
 	copy_file("test/data/subs5.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1330,7 +1330,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles)
 	prepare_directory (dir);
 	copy_file ("test/data/subs.mxf", dir / "subs.mxf");
 	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result(
@@ -1365,7 +1365,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles)
 	/* This broken_smpte.mxf does not use urn:uuid: for its subtitle ID, which we tolerate (rightly or wrongly) */
 	copy_file ("test/data/broken_smpte.mxf", dir / "subs.mxf");
 	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result (
@@ -1410,7 +1410,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles)
 	prepare_directory (dir);
 	copy_file ("test/data/empty_text.mxf", dir / "subs.mxf");
 	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result (
@@ -1452,7 +1452,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_child_nodes)
 	prepare_directory (dir);
 	copy_file ("test/data/empty_but_with_children.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1479,7 +1479,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_empty_child_nodes
 	prepare_directory (dir);
 	copy_file ("test/data/empty_with_empty_children.xml", dir / "subs.xml");
 	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1549,7 +1549,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
 
 	copy_file ("test/data/subs.mxf", dir / "subs.mxf");
 	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 
 	auto reel = make_shared<dcp::Reel>();
 	reel->add (reel_asset);
@@ -1686,7 +1686,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language1)
 	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
 	asset->_language = "wrong-andbad";
 	asset->write (dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
 	reel_asset->_language = "badlang";
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -1722,7 +1722,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language2)
 	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
 	asset->_language = "wrong-andbad";
 	asset->write (dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, asset, dcp::Fraction(24, 1), 6046, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, asset, dcp::Fraction(24, 1), 6046, 0);
 	reel_asset->_language = "badlang";
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -2113,7 +2113,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
 	add_font(asset);
 	asset->set_language (dcp::LanguageTag("de-DE"));
 	asset->write (dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, asset, dcp::Fraction(24, 1), 49148, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, asset, dcp::Fraction(24, 1), 49148, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result (
@@ -2170,7 +2170,7 @@ verify_timed_text_asset_too_large (string name)
 	asset->set_language (dcp::LanguageTag("de-DE"));
 	asset->write (dir / "subs.mxf");
 
-	auto reel_asset = make_shared<T>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 240, 0);
+	auto reel_asset = make_shared<T>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 240, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result (
@@ -2246,7 +2246,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 	auto subs = make_shared<dcp::SMPTETextAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
 	auto cpl = dcp->cpls()[0];
 	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
@@ -2292,7 +2292,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 		subs->add(simple_text());
 		add_font(subs);
 		subs->write (path / "subs1.mxf");
-		auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
+		auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[0]->add(reel_subs);
 	}
 
@@ -2302,7 +2302,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 		subs->add(simple_text());
 		add_font(subs);
 		subs->write (path / "subs2.mxf");
-		auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
+		auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[1]->add(reel_subs);
 	}
 
@@ -2354,7 +2354,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 		ccaps->add(simple_text());
 		add_font(ccaps);
 		ccaps->write (path / "subs1.mxf");
-		auto reel_ccaps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, ccaps, dcp::Fraction(24, 1), reel_length, 0);
+		auto reel_ccaps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, ccaps, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[0]->add(reel_ccaps);
 	}
 
@@ -2364,7 +2364,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 		ccaps->add(simple_text());
 		add_font(ccaps);
 		ccaps->write (path / "subs2.mxf");
-		auto reel_ccaps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, ccaps, dcp::Fraction(24, 1), reel_length, 0);
+		auto reel_ccaps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, ccaps, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[1]->add(reel_ccaps);
 	}
 
@@ -2434,7 +2434,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 	auto subs = make_shared<dcp::SMPTETextAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
 	auto cpl = dcp->cpls()[0];
 	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
@@ -2502,7 +2502,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 	auto subs = make_shared<dcp::SMPTETextAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
 	auto cpl = dcp->cpls()[0];
 	cpl->reels().front()->add(reel_subs);
 	dcp->write_xml();
@@ -2618,7 +2618,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
 {
 	auto const dir = path("build/test/verify_invalid_subtitle_first_text_time");
 	/* Just too early */
-	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, dir, {{ 4 * 24 - 1, 5 * 24 }});
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, dir, {{ 4 * 24 - 1, 5 * 24 }});
 	check_verify_result (
 		{ dir },
 		{},
@@ -2644,7 +2644,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time)
 {
 	auto const dir = path("build/test/verify_valid_subtitle_first_text_time");
 	/* Just late enough */
-	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, dir, {{ 4 * 24, 5 * 24 }});
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, dir, {{ 4 * 24, 5 * 24 }});
 	check_verify_result(
 		{dir},
 		{},
@@ -2674,7 +2674,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	asset1->set_language (dcp::LanguageTag("de-DE"));
 	add_font(asset1);
 	asset1->write (dir / "subs1.mxf");
-	auto reel_asset1 = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset1, dcp::Fraction(24, 1), 5 * 24, 0);
+	auto reel_asset1 = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, asset1, dcp::Fraction(24, 1), 5 * 24, 0);
 	auto reel1 = make_shared<dcp::Reel>();
 	reel1->add (reel_asset1);
 	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 5 * 24);
@@ -2688,7 +2688,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	add_test_subtitle (asset2, 3, 4 * 24);
 	asset2->set_language (dcp::LanguageTag("de-DE"));
 	asset2->write (dir / "subs2.mxf");
-	auto reel_asset2 = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset2, dcp::Fraction(24, 1), 4 * 24, 0);
+	auto reel_asset2 = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, asset2, dcp::Fraction(24, 1), 4 * 24, 0);
 	auto reel2 = make_shared<dcp::Reel>();
 	reel2->add (reel_asset2);
 	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 4 * 24);
@@ -2724,7 +2724,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
 {
 	auto const dir = path("build/test/verify_invalid_subtitle_spacing");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 4 * 24,     5 * 24 },
@@ -2754,7 +2754,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
 {
 	auto const dir = path("build/test/verify_valid_subtitle_spacing");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 4 * 24,      5 * 24 },
@@ -2781,7 +2781,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
 BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
 {
 	auto const dir = path("build/test/verify_invalid_subtitle_duration");
-	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, dir, {{ 4 * 24, 4 * 24 + 1 }});
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, dir, {{ 4 * 24, 4 * 24 + 1 }});
 	check_verify_result (
 		{dir},
 		{},
@@ -2805,7 +2805,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
 BOOST_AUTO_TEST_CASE (verify_valid_subtitle_duration)
 {
 	auto const dir = path("build/test/verify_valid_subtitle_duration");
-	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, dir, {{ 4 * 24, 4 * 24 + 17 }});
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, dir, {{ 4 * 24, 4 * 24 + 17 }});
 
 	check_verify_result(
 		{dir},
@@ -2835,7 +2835,7 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
 	asset->set_language (dcp::LanguageTag("de-DE"));
 	asset->write (dir / "subs.mxf");
 
-	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 3 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 3 * 24, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 	check_verify_result (
 		{dir},
@@ -2868,7 +2868,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
 {
 	auto const dir = path ("build/test/invalid_subtitle_line_count1");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
@@ -2900,7 +2900,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
 {
 	auto const dir = path ("build/test/verify_valid_subtitle_line_count1");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
@@ -2929,7 +2929,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
 {
 	auto const dir = path ("build/test/verify_invalid_subtitle_line_count2");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
@@ -2961,7 +2961,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
 {
 	auto const dir = path ("build/test/verify_valid_subtitle_line_count2");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
@@ -2991,7 +2991,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
 {
 	auto const dir = path ("build/test/verify_invalid_subtitle_line_length1");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "012345678901234567890123456789012345678901234567890123" }
@@ -3020,7 +3020,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
 {
 	auto const dir = path ("build/test/verify_invalid_subtitle_line_length2");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
@@ -3049,7 +3049,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
 {
 	auto const dir = path ("build/test/verify_valid_closed_caption_line_count1");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
@@ -3081,7 +3081,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
 {
 	auto const dir = path ("build/test/verify_valid_closed_caption_line_count2");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		dir,
 		{
 			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
@@ -3110,7 +3110,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
 {
 	auto const dir = path ("build/test/verify_invalid_closed_caption_line_count3");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
@@ -3142,7 +3142,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
 {
 	auto const dir = path ("build/test/verify_valid_closed_caption_line_count4");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
@@ -3172,7 +3172,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_length)
 {
 	auto const dir = path ("build/test/verify_valid_closed_caption_line_length");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "01234567890123456789012345678901" }
@@ -3199,7 +3199,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
 {
 	auto const dir = path ("build/test/verify_invalid_closed_caption_line_length");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "0123456789012345678901234567890123" }
@@ -3228,7 +3228,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign1)
 {
 	auto const dir = path ("build/test/verify_mismatched_closed_caption_valign1");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
@@ -3256,7 +3256,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign2)
 {
 	auto const dir = path ("build/test/verify_mismatched_closed_caption_valign2");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
@@ -3287,7 +3287,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering1)
 {
 	auto const dir = path ("build/test/verify_invalid_incorrect_closed_caption_ordering1");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
@@ -3316,7 +3316,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering2)
 {
 	auto const dir = path ("build/test/verify_invalid_incorrect_closed_caption_ordering2");
 	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		dir,
 		{
 			{ 96, 300, 0.2, dcp::VAlign::BOTTOM, "This" },
@@ -3344,7 +3344,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering2)
 BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering3)
 {
 	auto const dir = path ("build/test/verify_incorrect_closed_caption_ordering3");
-	auto cpl = dcp_with_text_from_file<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, dir, "test/data/verify_incorrect_closed_caption_ordering3.xml");
+	auto cpl = dcp_with_text_from_file<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, dir, "test/data/verify_incorrect_closed_caption_ordering3.xml");
 	check_verify_result (
 		{dir},
 		{},
@@ -3368,7 +3368,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering3)
 BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering4)
 {
 	auto const dir = path ("build/test/verify_incorrect_closed_caption_ordering4");
-	auto cpl = dcp_with_text_from_file<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, dir, "test/data/verify_incorrect_closed_caption_ordering4.xml");
+	auto cpl = dcp_with_text_from_file<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, dir, "test/data/verify_incorrect_closed_caption_ordering4.xml");
 
 	check_verify_result(
 		{dir},
@@ -3578,7 +3578,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 	subs->add(simple_text());
 	add_font(subs);
 	subs->write (dir / "subs.mxf");
-	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
 
 	auto reel1 = make_shared<dcp::Reel>(
 		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "1", reel_length), 0),
@@ -3586,7 +3586,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 		);
 
 	if (add_to_reel1) {
-		reel1->add (make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0));
+		reel1->add (make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
 	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
@@ -3601,7 +3601,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 		);
 
 	if (add_to_reel2) {
-		reel2->add (make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0));
+		reel2->add (make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
 	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
@@ -3718,7 +3718,7 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
 		);
 
 	for (int i = 0; i < caps_in_reel1; ++i) {
-		reel1->add (make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, subs, dcp::Fraction(24, 1), reel_length, 0));
+		reel1->add (make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
 	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
@@ -3733,7 +3733,7 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
 		);
 
 	for (int i = 0; i < caps_in_reel2; ++i) {
-		reel2->add (make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, subs, dcp::Fraction(24, 1), reel_length, 0));
+		reel2->add (make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CLOSED_CAPTION, subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
 	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
@@ -3885,7 +3885,7 @@ verify_text_entry_point_check(dcp::TextType type, path dir, dcp::VerificationNot
 BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 {
 	verify_text_entry_point_check<dcp::ReelSMPTETextAsset>(
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		"build/test/verify_subtitle_entry_point_must_be_present",
 		dcp::VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT,
 		[](shared_ptr<dcp::ReelSMPTETextAsset> asset) {
@@ -3894,7 +3894,7 @@ BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 		);
 
 	verify_text_entry_point_check<dcp::ReelSMPTETextAsset>(
-		dcp::TextType::SUBTITLE,
+		dcp::TextType::OPEN_SUBTITLE,
 		"build/test/verify_subtitle_entry_point_must_be_zero",
 		dcp::VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT,
 		[](shared_ptr<dcp::ReelSMPTETextAsset> asset) {
@@ -3903,7 +3903,7 @@ BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 		);
 
 	verify_text_entry_point_check<dcp::ReelSMPTETextAsset>(
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		"build/test/verify_closed_caption_entry_point_must_be_present",
 		dcp::VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT,
 		[](shared_ptr<dcp::ReelSMPTETextAsset> asset) {
@@ -3912,7 +3912,7 @@ BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 		);
 
 	verify_text_entry_point_check<dcp::ReelSMPTETextAsset>(
-		dcp::TextType::CAPTION,
+		dcp::TextType::CLOSED_CAPTION,
 		"build/test/verify_closed_caption_entry_point_must_be_zero",
 		dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT,
 		[](shared_ptr<dcp::ReelSMPTETextAsset> asset) {
@@ -4843,7 +4843,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
 	writer.Finalize();
 
 	auto subs_asset = make_shared<dcp::SMPTETextAsset>(subs_mxf);
-	auto subs_reel = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs_asset, dcp::Fraction(24, 1), 240, 0);
+	auto subs_reel = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs_asset, dcp::Fraction(24, 1), 240, 0);
 
 	auto cpl = write_dcp_with_single_asset (dir, subs_reel);
 
@@ -4923,7 +4923,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 	writer.Finalize();
 
 	auto subs_asset = make_shared<dcp::SMPTETextAsset>(subs_mxf);
-	auto subs_reel = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs_asset, dcp::Fraction(24, 1), 240, 0);
+	auto subs_reel = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs_asset, dcp::Fraction(24, 1), 240, 0);
 
 	auto cpl = write_dcp_with_single_asset (dir, subs_reel);
 
@@ -5603,7 +5603,7 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font_for_font)
 		editor.delete_first_line_containing("LoadFont");
 	}
 	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::OPEN_SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -5656,7 +5656,7 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font)
 	auto subs = make_shared<dcp::SMPTETextAsset>(dir / "subs.xml");
 	subs->write(dir / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 202, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), 202, 0);
 	auto cpl = dcp->cpls()[0];
 	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
@@ -5762,7 +5762,7 @@ BOOST_AUTO_TEST_CASE(verify_encrypted_smpte_dcp)
 	auto const dir = path("build/test/verify_encrypted_smpte_dcp");
 	dcp::Key key;
 	auto key_id = dcp::make_uuid();
-	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, dir, {{ 4 * 24, 5 * 24 }}, key, key_id);
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, dir, {{ 4 * 24, 5 * 24 }}, key, key_id);
 
 	dcp::DecryptedKDM kdm(dcp::LocalTime(), dcp::LocalTime(), "", "", "");
 	kdm.add_key(dcp::DecryptedKDMKey(string{"MDIK"}, key_id, key, cpl->id(), dcp::Standard::SMPTE));