X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=407ac26164e405cc674c0b349f4c4dcd7869f5ee;hb=565490c24a46d0aa941f75cf2a03b195246008b4;hp=7b7308a00737a09faec226c02037d470c4ed3bd2;hpb=878e19aabf2278828a3c9b518e0804b2cef0c01e;p=dcpomatic.git

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 7b7308a00..407ac2616 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -20,6 +20,7 @@
 
 /** @file  test/dcp_subtitle_test.cc
  *  @brief Test DCP subtitle content in various ways.
+ *  @ingroup specific
  */
 
 #include <boost/test/unit_test.hpp>
@@ -39,6 +40,21 @@
 using std::cout;
 using std::list;
 using boost::shared_ptr;
+using boost::optional;
+
+optional<ContentTextSubtitle> stored;
+
+static void
+store (ContentTextSubtitle sub)
+{
+	if (!stored) {
+		stored = sub;
+	} else {
+		BOOST_FOREACH (dcp::SubtitleString i, sub.subs) {
+			stored->subs.push_back (i);
+		}
+	}
+}
 
 /** Test pass-through of a very simple DCP subtitle file */
 BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
@@ -47,6 +63,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 	film->set_container (Ratio::from_id ("185"));
 	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"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
@@ -72,35 +89,16 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log()));
-
-	list<ContentTimePeriod> ctp = decoder->text_subtitles_during (
-		ContentTimePeriod (
-			ContentTime::from_seconds (25),
-			ContentTime::from_seconds (26)
-			),
-		true
-		);
-
-	BOOST_REQUIRE_EQUAL (ctp.size(), 2);
-	BOOST_CHECK_EQUAL (ctp.front().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get());
-	BOOST_CHECK_EQUAL (ctp.front().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get());
-	BOOST_CHECK_EQUAL (ctp.back().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get());
-	BOOST_CHECK_EQUAL (ctp.back().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get());
-
-	list<ContentTextSubtitle> subs = decoder->subtitle->get_text (
-		ContentTimePeriod (
-			ContentTime::from_seconds (25),
-			ContentTime::from_seconds (26)
-			),
-		true,
-		true
-		);
-
-	BOOST_REQUIRE_EQUAL (subs.size(), 1);
-	BOOST_REQUIRE_EQUAL (subs.front().subs.size(), 2);
-	BOOST_CHECK_EQUAL (subs.front().subs.front().text(), "Noch mal.");
-	BOOST_CHECK_EQUAL (subs.front().subs.back().text(), "Encore une fois.");
+	shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false));
+	decoder->subtitle->TextStart.connect (bind (store, _1));
+
+	stored = optional<ContentTextSubtitle> ();
+	while (!decoder->pass() && !stored) {}
+
+	BOOST_REQUIRE (stored);
+	BOOST_REQUIRE_EQUAL (stored->subs.size(), 2);
+	BOOST_CHECK_EQUAL (stored->subs.front().text(), "Noch mal.");
+	BOOST_CHECK_EQUAL (stored->subs.back().text(), "Encore une fois.");
 }
 
 /** Test subtitles whose text includes things like &lt;b&gt; */
@@ -115,12 +113,14 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
 	wait_for_jobs ();
 
 	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
-	list<ContentTextSubtitle> sub = decoder->subtitle->get_text (
-		ContentTimePeriod (ContentTime::from_seconds(0), ContentTime::from_seconds(2)), true, true
-		);
-	BOOST_REQUIRE_EQUAL (sub.size(), 1);
-	BOOST_REQUIRE_EQUAL (sub.front().subs.size(), 1);
-	BOOST_CHECK_EQUAL (sub.front().subs.front().text(), "&lt;b&gt;Hello world!&lt;/b&gt;");
+	decoder->subtitle->TextStart.connect (bind (store, _1));
+
+	stored = optional<ContentTextSubtitle> ();
+	while (!decoder->pass ()) {
+		if (stored && stored->from() == ContentTime(0)) {
+			BOOST_CHECK_EQUAL (stored->subs.front().text(), "&lt;b&gt;Hello world!&lt;/b&gt;");
+		}
+	}
 }
 
 /** Test a failure case */
@@ -139,20 +139,21 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
 	wait_for_jobs ();
 
 	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
-	list<ContentTextSubtitle> sub = decoder->subtitle->get_text (
-		ContentTimePeriod (ContentTime::from_seconds(0), ContentTime::from_seconds(2)), true, true
-		);
-	BOOST_REQUIRE_EQUAL (sub.size(), 1);
-	BOOST_REQUIRE_EQUAL (sub.front().subs.size(), 3);
-	list<dcp::SubtitleString> s = sub.front().subs;
-	list<dcp::SubtitleString>::const_iterator i = s.begin ();
-	BOOST_CHECK_EQUAL (i->text(), "This");
-	++i;
-	BOOST_REQUIRE (i != s.end ());
-	BOOST_CHECK_EQUAL (i->text(), " is ");
-	++i;
-	BOOST_REQUIRE (i != s.end ());
-	BOOST_CHECK_EQUAL (i->text(), "wrong.");
-	++i;
-	BOOST_REQUIRE (i == s.end ());
+	stored = optional<ContentTextSubtitle> ();
+	while (!decoder->pass ()) {
+		decoder->subtitle->TextStart.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 ();
+			BOOST_CHECK_EQUAL (i->text(), "This");
+			++i;
+			BOOST_REQUIRE (i != s.end ());
+			BOOST_CHECK_EQUAL (i->text(), " is ");
+			++i;
+			BOOST_REQUIRE (i != s.end ());
+			BOOST_CHECK_EQUAL (i->text(), "wrong.");
+			++i;
+			BOOST_REQUIRE (i == s.end ());
+		}
+	}
 }