PlainText -> PlainTextFile.

7 files changed, 25 insertions, 25 deletions

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index e579621c6..00ca976e0 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -24,7 +24,7 @@
 #include "lib/image_content.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
-#include "lib/plain_text_content.h"
+#include "lib/plain_text_file_content.h"
 #include "lib/ratio.h"
 #include "lib/transcode_job.h"
 #include "lib/dcp_content.h"
@@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
 
-	shared_ptr<PlainTextContent> s (new PlainTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<PlainTextFileContent> s (new PlainTextFileContent (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));
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<PlainTextContent> s (new PlainTextContent (film, "test/data/subrip.srt"));
+	shared_ptr<PlainTextFileContent> s (new PlainTextFileContent (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));
@@ -172,7 +172,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
 
-	shared_ptr<PlainTextContent> s (new PlainTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<PlainTextFileContent> s (new PlainTextFileContent (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));
@@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<PlainTextContent> s (new PlainTextContent (film, "test/data/subrip.srt"));
+	shared_ptr<PlainTextFileContent> s (new PlainTextFileContent (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));
diff --git a/test/player_test.cc b/test/player_test.cc
index 7cc3bc27b..a66860911 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -31,7 +31,7 @@
 #include "lib/player.h"
 #include "lib/video_content.h"
 #include "lib/image_content.h"
-#include "lib/plain_text_content.h"
+#include "lib/plain_text_file_content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/text_content.h"
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<PlainTextContent> s (new PlainTextContent (film, "test/data/subrip.srt"));
+	shared_ptr<PlainTextFileContent> s (new PlainTextFileContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (s);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
diff --git a/test/reels_test.cc b/test/reels_test.cc
index 70552a703..9a915ab2b 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -30,7 +30,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"
 #include "lib/video_content.h"
-#include "lib/plain_text_content.h"
+#include "lib/plain_text_file_content.h"
 #include "lib/content_factory.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE (reels_test3)
 
 	shared_ptr<Content> dcp (new DCPContent (film, "test/data/reels_test2"));
 	film->examine_and_add_content (dcp);
-	shared_ptr<Content> sub (new PlainTextContent (film, "test/data/subrip.srt"));
+	shared_ptr<Content> sub (new PlainTextFileContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (sub);
 	wait_for_jobs ();
 
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 		content[i]->video->set_length (24);
 	}
 
-	shared_ptr<PlainTextContent> subs (new PlainTextContent (film, "test/data/subrip3.srt"));
+	shared_ptr<PlainTextFileContent> subs (new PlainTextFileContent (film, "test/data/subrip3.srt"));
 	film->examine_and_add_content (subs);
 	wait_for_jobs ();
 
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index e44e33c14..268da3472 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -24,7 +24,7 @@
  */
 
 #include "lib/film.h"
-#include "lib/plain_text_content.h"
+#include "lib/plain_text_file_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->set_name ("frobozz");
 	film->set_audio_channels (6);
 	film->set_interop (false);
-	shared_ptr<PlainTextContent> content (new PlainTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	film->set_name ("frobozz");
 	film->set_audio_channels (6);
 	film->set_interop (false);
-	shared_ptr<PlainTextContent> content (new PlainTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->set_name ("frobozz");
 	film->set_interop (true);
 	film->set_audio_channels (6);
-	shared_ptr<PlainTextContent> content (new PlainTextContent (film, private_data / "Ankoemmling_short.srt"));
+	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, private_data / "Ankoemmling_short.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_interop (false);
-	shared_ptr<PlainTextContent> content (new PlainTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, "test/data/subrip2.srt"));
 	content->subtitle->set_use (true);
 	content->subtitle->set_burn (false);
 	film->examine_and_add_content (content);
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 	film->set_name ("frobozz");
 	film->set_interop (true);
 	film->set_sequence (false);
-	shared_ptr<PlainTextContent> content (new PlainTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, "test/data/subrip2.srt"));
 	content->subtitle->set_use (true);
 	content->subtitle->set_burn (false);
 	film->examine_and_add_content (content);
@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
 {
 	shared_ptr<Film> film = new_test_film2 ("srt_subtitle_test6");
 	film->set_interop (false);
-	shared_ptr<PlainTextContent> content (new PlainTextContent (film, "test/data/frames.srt"));
+	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, "test/data/frames.srt"));
 	content->subtitle->set_use (true);
 	content->subtitle->set_burn (false);
 	film->examine_and_add_content (content);
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
 BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 {
 	shared_ptr<Film> film = new_test_film ("subrip_render_test");
-	shared_ptr<PlainText> content (new PlainText (film, "test/data/subrip.srt"));
+	shared_ptr<PlainTextFile> content (new PlainTextFile (film, "test/data/subrip.srt"));
 	content->examine (shared_ptr<Job> (), true);
 	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471));
 
diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index ab15af139..536a3ce6a 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -24,7 +24,7 @@
  */
 
 #include "lib/film.h"
-#include "lib/plain_text_content.h"
+#include "lib/plain_text_file_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_interop (true);
-	shared_ptr<PlainTextContent> content (new PlainTextContent (film, private_data / "DKH_UT_EN20160601def.ssa"));
+	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, private_data / "DKH_UT_EN20160601def.ssa"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc
index 2b1b97b25..892ea76f5 100644
--- a/test/subtitle_charset_test.cc
+++ b/test/subtitle_charset_test.cc
@@ -22,8 +22,8 @@
 #include "lib/content.h"
 #include "lib/film.h"
 #include "lib/content_factory.h"
-#include "lib/plain_text.h"
-#include "lib/plain_text_content.h"
+#include "lib/plain_text_file.h"
+#include "lib/plain_text_file_content.h"
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (subtitle_charset_test2)
 	shared_ptr<Content> content = content_factory (film, "test/data/osx.srt").front ();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	shared_ptr<PlainText> ts = dynamic_pointer_cast<PlainText> (content);
+	shared_ptr<PlainTextFile> ts = dynamic_pointer_cast<PlainTextFile> (content);
 	BOOST_REQUIRE (ts);
 	/* Make sure we got the subtitle data from the file */
 	BOOST_REQUIRE_EQUAL (content->full_length().get(), 6052032);
diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index 317f93ff5..ee9c8ecc7 100644
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include "lib/plain_text_content.h"
+#include "lib/plain_text_file_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/text_content.h"
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<PlainTextContent> content (new PlainTextContent (film, "test/data/subrip5.srt"));
+	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, "test/data/subrip5.srt"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	content->subtitle->set_use (true);