X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=eefdb4122ceb4bd6cc62b908ffd911693234c975;hp=d931cf8033e4400f22caa42e44e97e1087bfcd40;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index d931cf803..eefdb4122 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -24,7 +24,7 @@
  */
 
 #include "lib/film.h"
-#include "lib/text_text_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
@@ -37,6 +37,7 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 /** Make a very short DCP with a single subtitle from .srt with no specified fonts */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test)
@@ -47,14 +48,14 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->set_name ("frobozz");
 	film->set_audio_channels (6);
 	film->set_interop (false);
-	shared_ptr<TextTextContent> content (new TextTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->only_text()->set_use (true);
+	content->only_text()->set_burn (false);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Should be blank video with a subtitle MXF */
 	check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ()));
@@ -69,17 +70,17 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	film->set_name ("frobozz");
 	film->set_audio_channels (6);
 	film->set_interop (false);
-	shared_ptr<TextTextContent> content (new TextTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent ("test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->only_text()->set_use (true);
+	content->only_text()->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->only_text()->fonts().front()->set_file("test/data/subrip2.srt");
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Should be blank video with a subtitle MXF */
 	check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
@@ -104,15 +105,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->set_name ("frobozz");
 	film->set_interop (true);
 	film->set_audio_channels (6);
-	shared_ptr<TextTextContent> content (new TextTextContent (film, private_data / "Ankoemmling_short.srt"));
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "Ankoemmling_short.srt"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->only_text()->set_use (true);
+	content->only_text()->set_burn (false);
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	check_subtitle_file (film, private_data / "Ankoemmling_short.xml");
 }
@@ -125,13 +126,13 @@ 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<TextTextContent> content (new TextTextContent (film, "test/data/subrip2.srt"));
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip2.srt"));
+	content->only_text()->set_use (true);
+	content->only_text()->set_burn (false);
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Should be blank video with MXF subtitles */
 	check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));
@@ -146,15 +147,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 	film->set_name ("frobozz");
 	film->set_interop (true);
 	film->set_sequence (false);
-	shared_ptr<TextTextContent> content (new TextTextContent (film, "test/data/subrip2.srt"));
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip2.srt"));
+	content->only_text()->set_use (true);
+	content->only_text()->set_burn (false);
 	film->examine_and_add_content (content);
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
-	content->set_position (DCPTime (0));
+	BOOST_REQUIRE (!wait_for_jobs());
+	content->set_position (film, DCPTime());
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
 
 	check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ()));
@@ -164,9 +165,9 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
 {
 	shared_ptr<Film> film = new_test_film2 ("srt_subtitle_test6");
 	film->set_interop (false);
-	shared_ptr<TextTextContent> content (new TextTextContent (film, "test/data/frames.srt"));
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/frames.srt"));
+	content->only_text()->set_use (true);
+	content->only_text()->set_burn (false);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->make_dcp ();
@@ -185,19 +186,19 @@ 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<TextTextContent> content (new TextTextContent (film, "test/data/subrip.srt"));
+	shared_ptr<StringTextFile> content (new StringTextFile("test/data/subrip.srt"));
 	content->examine (shared_ptr<Job> (), true);
 	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_text_subtitles (
+	list<ContentStringText> cts = decoder->get_plain_texts (
 		ContentTimePeriod (
 			ContentTime::from_seconds (109), ContentTime::from_seconds (110)
 			), false
 		);
 	BOOST_CHECK_EQUAL (cts.size(), 1);
 
-	PositionImage image = render_subtitles (cts.front().subs, dcp::Size (1998, 1080));
+	PositionImage image = render_text (cts.front().subs, dcp::Size (1998, 1080));
 	write_image (image.image, "build/test/subrip_render_test.png");
 	check_file ("build/test/subrip_render_test.png", "test/data/subrip_render_test.png");
 }