Clean up after previous commit.

12 files changed, 66 insertions, 66 deletions

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index e5d0408bb..48f88f8dc 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -25,16 +25,16 @@
 
 #include <boost/test/unit_test.hpp>
 #include "lib/film.h"
-#include "lib/dcp_text_content.h"
+#include "lib/dcp_subtitle_content.h"
 #include "lib/dcp_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_decoder.h"
 #include "lib/dcp_content_type.h"
-#include "lib/dcp_text_decoder.h"
-#include "lib/text_content.h"
-#include "lib/content_text.h"
+#include "lib/dcp_subtitle_decoder.h"
+#include "lib/caption_content.h"
+#include "lib/content_caption.h"
 #include "lib/font.h"
-#include "lib/text_decoder.h"
+#include "lib/caption_decoder.h"
 #include "test.h"
 #include <iostream>
 
@@ -65,14 +65,14 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_interop (false);
-	shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(2).get());
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false));
-	decoder->subtitle->PlainStart.connect (bind (store, _1));
+	decoder->caption->PlainStart.connect (bind (store, _1));
 
 	stored = optional<ContentTextCaption> ();
 	while (!decoder->pass() && !stored) {}
@@ -109,12 +109,12 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub2.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<DCPTextDecoder> decoder (new DCPTextDecoder (content, film->log()));
-	decoder->subtitle->PlainStart.connect (bind (store, _1));
+	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
+	decoder->caption->PlainStart.connect (bind (store, _1));
 
 	stored = optional<ContentTextCaption> ();
 	while (!decoder->pass ()) {
@@ -132,17 +132,17 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_interop (true);
-	shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub3.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<DCPTextDecoder> decoder (new DCPTextDecoder (content, film->log()));
+	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
 	stored = optional<ContentTextCaption> ();
 	while (!decoder->pass ()) {
-		decoder->subtitle->PlainStart.connect (bind (store, _1));
+		decoder->caption->PlainStart.connect (bind (store, _1));
 		if (stored && stored->from() == ContentTime::from_seconds(0.08)) {
 			list<dcp::SubtitleString> s = stored->subs;
 			list<dcp::SubtitleString>::const_iterator i = s.begin ();
@@ -165,14 +165,14 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
 	shared_ptr<Film> film = new_test_film2 ("dcp_subtitle_test4");
 	film->set_interop (true);
 
-	shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub3.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
 	film->examine_and_add_content (content);
-	shared_ptr<DCPTextContent> content2 (new DCPTextContent (film, "test/data/dcp_sub3.xml"));
+	shared_ptr<DCPSubtitleContent> content2 (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
 	film->examine_and_add_content (content2);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	content->subtitle->add_font (shared_ptr<Font> (new Font ("font1")));
-	content2->subtitle->add_font (shared_ptr<Font> (new Font ("font2")));
+	content->caption->add_font (shared_ptr<Font> (new Font ("font1")));
+	content2->caption->add_font (shared_ptr<Font> (new Font ("font2")));
 
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 65ca59d34..d9dd0f383 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -28,7 +28,7 @@
 #include "lib/ratio.h"
 #include "lib/transcode_job.h"
 #include "lib/dcp_content.h"
-#include "lib/text_content.h"
+#include "lib/caption_content.h"
 #include "lib/compose.hpp"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -124,9 +124,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
 	shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (s);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	s->subtitle->set_colour (dcp::Colour (255, 255, 0));
-	s->subtitle->set_effect (dcp::SHADOW);
-	s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
+	s->caption->set_colour (dcp::Colour (255, 255, 0));
+	s->caption->set_effect (dcp::SHADOW);
+	s->caption->set_effect_colour (dcp::Colour (0, 255, 255));
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
@@ -149,9 +149,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
 	shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (s);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	s->subtitle->set_colour (dcp::Colour (255, 255, 0));
-	s->subtitle->set_effect (dcp::SHADOW);
-	s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
+	s->caption->set_colour (dcp::Colour (255, 255, 0));
+	s->caption->set_effect (dcp::SHADOW);
+	s->caption->set_effect_colour (dcp::Colour (0, 255, 255));
 
 	shared_ptr<Job> job (new TranscodeJob (film));
 	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", FFmpegEncoder::FORMAT_PRORES, false);
@@ -175,9 +175,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
 	shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (s);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	s->subtitle->set_colour (dcp::Colour (255, 255, 0));
-	s->subtitle->set_effect (dcp::SHADOW);
-	s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
+	s->caption->set_colour (dcp::Colour (255, 255, 0));
+	s->caption->set_effect (dcp::SHADOW);
+	s->caption->set_effect_colour (dcp::Colour (0, 255, 255));
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
@@ -200,9 +200,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
 	shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (s);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	s->subtitle->set_colour (dcp::Colour (255, 255, 0));
-	s->subtitle->set_effect (dcp::SHADOW);
-	s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
+	s->caption->set_colour (dcp::Colour (255, 255, 0));
+	s->caption->set_effect (dcp::SHADOW);
+	s->caption->set_effect_colour (dcp::Colour (0, 255, 255));
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index c12f15fa1..1f5247392 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -25,7 +25,7 @@
 
 #include "test.h"
 #include "lib/film.h"
-#include "lib/dcp_text_content.h"
+#include "lib/dcp_subtitle_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"
diff --git a/test/player_test.cc b/test/player_test.cc
index d3b6df6da..4ff79b436 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -34,7 +34,7 @@
 #include "lib/text_caption_file_content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
-#include "lib/text_content.h"
+#include "lib/caption_content.h"
 #include "lib/butler.h"
 #include "lib/compose.hpp"
 #include "test.h"
@@ -211,7 +211,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 	shared_ptr<DCPContent> dcp (new DCPContent (film, private_data / "awkward_subs"));
 	film->examine_and_add_content (dcp, true);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	dcp->subtitle->set_use (true);
+	dcp->caption->set_use (true);
 
 	shared_ptr<Player> player (new Player (film, film->playlist()));
 	player->set_fast ();
@@ -242,7 +242,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 	shared_ptr<DCPContent> dcp (new DCPContent (film, private_data / "awkward_subs2"));
 	film->examine_and_add_content (dcp, true);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	dcp->subtitle->set_use (true);
+	dcp->caption->set_use (true);
 
 	shared_ptr<Player> player (new Player (film, film->playlist()));
 	player->set_fast ();
diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc
index e7e9c67b2..79e12f7a0 100644
--- a/test/remake_id_test.cc
+++ b/test/remake_id_test.cc
@@ -20,7 +20,7 @@
 
 #include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
-#include "lib/text_content.h"
+#include "lib/caption_content.h"
 #include "lib/job_manager.h"
 #include "lib/film.h"
 #include "lib/dcp_content.h"
diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 4e286523f..5c371e855 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -20,7 +20,7 @@
 
 #include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
-#include "lib/text_content.h"
+#include "lib/caption_content.h"
 #include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -37,14 +37,14 @@ BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
 	shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(content_factory(film, private_data / "prophet_short_clip.mkv").front());
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	content->subtitle->set_burn (true);
-	content->subtitle->set_use (true);
+	content->caption->set_burn (true);
+	content->caption->set_use (true);
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
 
-	content->subtitle->set_use (false);
+	content->caption->set_use (false);
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
 
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 6fe430d77..28ef9606f 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -28,7 +28,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
-#include "lib/text_content.h"
+#include "lib/caption_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -51,8 +51,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 	film->make_dcp ();
 	wait_for_jobs ();
 
@@ -73,10 +73,10 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 	/* Use test/data/subrip2.srt as if it were a font file  */
-	content->subtitle->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
+	content->caption->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
 
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -108,8 +108,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -126,8 +126,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 	film->set_name ("frobozz");
 	film->set_interop (false);
 	shared_ptr<TextCaptionFileContent> content (new TextCaptionFileContent (film, "test/data/subrip2.srt"));
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 	film->make_dcp ();
@@ -147,8 +147,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 	film->set_interop (true);
 	film->set_sequence (false);
 	shared_ptr<TextCaptionFileContent> content (new TextCaptionFileContent (film, "test/data/subrip2.srt"));
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 	film->examine_and_add_content (content);
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
@@ -165,8 +165,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
 	shared_ptr<Film> film = new_test_film2 ("srt_subtitle_test6");
 	film->set_interop (false);
 	shared_ptr<TextCaptionFileContent> content (new TextCaptionFileContent (film, "test/data/frames.srt"));
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->make_dcp ();
@@ -190,7 +190,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471));
 
 	shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (content));
-	list<ContentTextSubtitle> cts = decoder->get_plain_texts (
+	list<ContentTextCaption> cts = decoder->get_plain_texts (
 		ContentTimePeriod (
 			ContentTime::from_seconds (109), ContentTime::from_seconds (110)
 			), false
diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index b3e4f9d33..6d4eecd92 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -28,7 +28,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
-#include "lib/text_content.h"
+#include "lib/caption_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -51,8 +51,8 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 
 	film->make_dcp ();
 	wait_for_jobs ();
diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc
index 3e7df0a61..b15e3e70e 100644
--- a/test/subtitle_charset_test.cc
+++ b/test/subtitle_charset_test.cc
@@ -22,7 +22,7 @@
 #include "lib/content.h"
 #include "lib/film.h"
 #include "lib/content_factory.h"
-#include "lib/plain_text_file.h"
+#include "lib/text_caption_file.h"
 #include "lib/text_caption_file_content.h"
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index 27c6e2d0e..a82094a73 100644
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -21,7 +21,7 @@
 #include "lib/text_caption_file_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
-#include "lib/text_content.h"
+#include "lib/caption_content.h"
 #include "lib/dcp_content_type.h"
 #include "test.h"
 #include <dcp/cpl.h>
@@ -46,8 +46,8 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
 	shared_ptr<TextCaptionFileContent> content (new TextCaptionFileContent (film, "test/data/subrip5.srt"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->caption->set_use (true);
+	content->caption->set_burn (false);
 	film->set_reel_type (REELTYPE_BY_LENGTH);
 	film->set_interop (true);
 	film->set_reel_length (1024 * 1024 * 512);
diff --git a/test/subtitle_trim_test.cc b/test/subtitle_trim_test.cc
index 1174eb583..33bcf823f 100644
--- a/test/subtitle_trim_test.cc
+++ b/test/subtitle_trim_test.cc
@@ -19,7 +19,7 @@
 */
 
 #include "lib/film.h"
-#include "lib/dcp_text_content.h"
+#include "lib/dcp_subtitle_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (subtitle_trim_test1)
 {
 	shared_ptr<Film> film = new_test_film2 ("subtitle_trim_test1");
-	shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub5.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub5.xml"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index 1ed5ac810..8b6e215ba 100644
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -25,7 +25,7 @@
 
 #include "test.h"
 #include "lib/film.h"
-#include "lib/dcp_text_content.h"
+#include "lib/dcp_subtitle_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"