Rename ReelClosedCaptionAsset -> ReelCaptionAsset

for symmetry with ReelSubtitleAsset.

1 files changed, 26 insertions, 26 deletions

diff --git a/test/verify_test.cc b/test/verify_test.cc
index a465bac4..cbd15c5c 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -43,13 +43,13 @@
 #include "openjpeg_image.h"
 #include "raw_convert.h"
 #include "reel.h"
-#include "reel_interop_closed_caption_asset.h"
+#include "reel_interop_caption_asset.h"
 #include "reel_interop_subtitle_asset.h"
 #include "reel_markers_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_stereo_picture_asset.h"
-#include "reel_smpte_closed_caption_asset.h"
+#include "reel_smpte_caption_asset.h"
 #include "reel_smpte_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "stereo_j2k_picture_asset.h"
@@ -1206,7 +1206,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::InteropSubtitleAsset>(dir / "ccap.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1724,7 +1724,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language2)
 	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
 	asset->_language = "wrong-andbad";
 	asset->write (dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTECaptionAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
 	reel_asset->_language = "badlang";
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -2115,7 +2115,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::ReelSMPTEClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 49148, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTECaptionAsset>(asset, dcp::Fraction(24, 1), 49148, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result (
@@ -2210,7 +2210,7 @@ verify_timed_text_asset_too_large (string name)
 BOOST_AUTO_TEST_CASE (verify_subtitle_asset_too_large)
 {
 	verify_timed_text_asset_too_large<dcp::ReelSMPTESubtitleAsset>("verify_subtitle_asset_too_large");
-	verify_timed_text_asset_too_large<dcp::ReelSMPTEClosedCaptionAsset>("verify_closed_caption_asset_too_large");
+	verify_timed_text_asset_too_large<dcp::ReelSMPTECaptionAsset>("verify_closed_caption_asset_too_large");
 }
 
 
@@ -2356,7 +2356,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 		ccaps->add (simple_subtitle());
 		add_font(ccaps);
 		ccaps->write (path / "subs1.mxf");
-		auto reel_ccaps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
+		auto reel_ccaps = make_shared<dcp::ReelSMPTECaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[0]->add(reel_ccaps);
 	}
 
@@ -2366,7 +2366,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 		ccaps->add (simple_subtitle());
 		add_font(ccaps);
 		ccaps->write (path / "subs2.mxf");
-		auto reel_ccaps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
+		auto reel_ccaps = make_shared<dcp::ReelSMPTECaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[1]->add(reel_ccaps);
 	}
 
@@ -3042,7 +3042,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
@@ -3073,7 +3073,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
@@ -3101,7 +3101,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
@@ -3132,7 +3132,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
@@ -3161,7 +3161,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "01234567890123456789012345678901" }
@@ -3187,7 +3187,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_length)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "0123456789012345678901234567890123" }
@@ -3215,7 +3215,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
@@ -3242,7 +3242,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign1)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
@@ -3272,7 +3272,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign2)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::TOP, "This" },
@@ -3300,7 +3300,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering1)
 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::ReelSMPTEClosedCaptionAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTECaptionAsset> (
 		dir,
 		{
 			{ 96, 300, 0.2, dcp::VAlign::BOTTOM, "This" },
@@ -3328,7 +3328,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::ReelSMPTEClosedCaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering3.xml");
+	auto cpl = dcp_with_text_from_file<dcp::ReelSMPTECaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering3.xml");
 	check_verify_result (
 		{dir},
 		{},
@@ -3352,7 +3352,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::ReelSMPTEClosedCaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering4.xml");
+	auto cpl = dcp_with_text_from_file<dcp::ReelSMPTECaptionAsset> (dir, "test/data/verify_incorrect_closed_caption_ordering4.xml");
 
 	check_verify_result(
 		{dir},
@@ -3702,7 +3702,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::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
+		reel1->add (make_shared<dcp::ReelSMPTECaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
 	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
@@ -3717,7 +3717,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::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
+		reel2->add (make_shared<dcp::ReelSMPTECaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
 	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
@@ -3884,18 +3884,18 @@ BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 			}
 		);
 
-	verify_text_entry_point_check<dcp::ReelSMPTEClosedCaptionAsset> (
+	verify_text_entry_point_check<dcp::ReelSMPTECaptionAsset> (
 		"build/test/verify_closed_caption_entry_point_must_be_present",
 		dcp::VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT,
-		[](shared_ptr<dcp::ReelSMPTEClosedCaptionAsset> asset) {
+		[](shared_ptr<dcp::ReelSMPTECaptionAsset> asset) {
 			asset->unset_entry_point ();
 			}
 		);
 
-	verify_text_entry_point_check<dcp::ReelSMPTEClosedCaptionAsset> (
+	verify_text_entry_point_check<dcp::ReelSMPTECaptionAsset> (
 		"build/test/verify_closed_caption_entry_point_must_be_zero",
 		dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT,
-		[](shared_ptr<dcp::ReelSMPTEClosedCaptionAsset> asset) {
+		[](shared_ptr<dcp::ReelSMPTECaptionAsset> asset) {
 			asset->set_entry_point (9);
 			}
 		);