Rename SubRip -> TextSubtitle.

5 files changed, 12 insertions, 12 deletions

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index e2f7272be..fc5b88578 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -22,7 +22,7 @@
  */
 
 #include <boost/test/unit_test.hpp>
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
 	content->set_use_subtitles (true);
 	content->set_burn_subtitles (true);
 	film->examine_and_add_content (content, true);
diff --git a/test/reels_test.cc b/test/reels_test.cc
index 12a311fe8..b5a24f7fc 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -23,7 +23,7 @@
 #include "lib/image_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
@@ -155,7 +155,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 SubRipContent (film, "test/data/subrip.srt"));
+	shared_ptr<Content> sub (new TextSubtitleContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (sub);
 	wait_for_jobs ();
 
@@ -198,7 +198,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 		content[i]->set_video_length (24);
 	}
 
-	shared_ptr<SubRipContent> subs (new SubRipContent (film, "test/data/subrip3.srt"));
+	shared_ptr<TextSubtitleContent> subs (new TextSubtitleContent (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 759c2720c..c2d3e27bd 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -22,7 +22,7 @@
  */
 
 #include "lib/film.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (srt_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<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_interop (true);
-	shared_ptr<SubRipContent> content (new SubRipContent (film, private_data / "Ankoemmling.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, private_data / "Ankoemmling.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
diff --git a/test/subrip_test.cc b/test/subrip_test.cc
index cd517cfe9..d443a416d 100644
--- a/test/subrip_test.cc
+++ b/test/subrip_test.cc
@@ -39,7 +39,7 @@ using boost::dynamic_pointer_cast;
 BOOST_AUTO_TEST_CASE (subrip_render_test)
 {
 	shared_ptr<Film> film = new_test_film ("subrip_render_test");
-	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (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/xml_subtitle_test.cc b/test/xml_subtitle_test.cc
index 837c73c58..554591b92 100644
--- a/test/xml_subtitle_test.cc
+++ b/test/xml_subtitle_test.cc
@@ -22,7 +22,7 @@
  */
 
 #include <boost/test/unit_test.hpp>
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE (xml_subtitle_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
 	content->set_use_subtitles (true);
 	content->set_burn_subtitles (false);
 	film->examine_and_add_content (content);