X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=4b3d8fc971076b80b30c0b553813b6af893794c3;hb=cde792116ecae3d61f9b724fc581fdf82f30a0a9;hp=2dbf43b2a0418f7a5e1c74a5e8f2e2780ab2549f;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 2dbf43b2a..4b3d8fc97 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -42,6 +42,7 @@ using std::cout;
 using std::list;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 optional<ContentStringText> stored;
 
@@ -65,14 +66,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<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent ("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());
+	BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(2).get());
 
-	content->only_caption()->set_use (true);
-	content->only_caption()->set_burn (false);
+	content->only_text()->set_use (true);
+	content->only_text()->set_burn (false);
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -86,12 +87,12 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<DCPContent> content (new DCPContent (film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+	shared_ptr<DCPContent> content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false));
-	decoder->only_caption()->PlainStart.connect (bind (store, _1));
+	shared_ptr<DCPDecoder> decoder (new DCPDecoder (film, content, false, false, shared_ptr<DCPDecoder>()));
+	decoder->only_text()->PlainStart.connect (bind (store, _1));
 
 	stored = optional<ContentStringText> ();
 	while (!decoder->pass() && !stored) {}
@@ -109,15 +110,15 @@ 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<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent("test/data/dcp_sub2.xml"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
-	decoder->only_caption()->PlainStart.connect (bind (store, _1));
+	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder(film, content));
+	decoder->only_text()->PlainStart.connect (bind (store, _1));
 
 	stored = optional<ContentStringText> ();
-	while (!decoder->pass ()) {
+	while (!decoder->pass()) {
 		if (stored && stored->from() == ContentTime(0)) {
 			BOOST_CHECK_EQUAL (stored->subs.front().text(), "&lt;b&gt;Hello world!&lt;/b&gt;");
 		}
@@ -132,17 +133,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<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent ("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<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
+	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (film, content));
 	stored = optional<ContentStringText> ();
 	while (!decoder->pass ()) {
-		decoder->only_caption()->PlainStart.connect (bind (store, _1));
+		decoder->only_text()->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 +166,14 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
 	shared_ptr<Film> film = new_test_film2 ("dcp_subtitle_test4");
 	film->set_interop (true);
 
-	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent ("test/data/dcp_sub3.xml"));
 	film->examine_and_add_content (content);
-	shared_ptr<DCPSubtitleContent> content2 (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
+	shared_ptr<DCPSubtitleContent> content2 (new DCPSubtitleContent ("test/data/dcp_sub3.xml"));
 	film->examine_and_add_content (content2);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	content->only_caption()->add_font (shared_ptr<Font> (new Font ("font1")));
-	content2->only_caption()->add_font (shared_ptr<Font> (new Font ("font2")));
+	content->only_text()->add_font (shared_ptr<Font> (new Font ("font1")));
+	content2->only_text()->add_font (shared_ptr<Font> (new Font ("font2")));
 
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());