X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=2dbf43b2a0418f7a5e1c74a5e8f2e2780ab2549f;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hp=407ac26164e405cc674c0b349f4c4dcd7869f5ee;hpb=308fb04d15cecb471c8c04db40d2979810efefe3;p=dcpomatic.git

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 407ac2616..2dbf43b2a 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,9 +31,10 @@
 #include "lib/dcp_decoder.h"
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_subtitle_decoder.h"
-#include "lib/subtitle_content.h"
-#include "lib/content_subtitle.h"
-#include "lib/subtitle_decoder.h"
+#include "lib/text_content.h"
+#include "lib/content_text.h"
+#include "lib/font.h"
+#include "lib/text_decoder.h"
 #include "test.h"
 #include <iostream>
 
@@ -42,10 +43,10 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
-optional<ContentTextSubtitle> stored;
+optional<ContentStringText> stored;
 
 static void
-store (ContentTextSubtitle sub)
+store (ContentStringText sub)
 {
 	if (!stored) {
 		stored = sub;
@@ -66,14 +67,14 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 	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 ();
+	BOOST_REQUIRE (!wait_for_jobs ());
 
 	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(2).get());
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->only_caption()->set_use (true);
+	content->only_caption()->set_burn (false);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs ());
 
 	check_dcp ("test/data/dcp_subtitle_test", film->dir (film->dcp_name ()));
 }
@@ -87,12 +88,12 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	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"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs ());
 
 	shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false));
-	decoder->subtitle->TextStart.connect (bind (store, _1));
+	decoder->only_caption()->PlainStart.connect (bind (store, _1));
 
-	stored = optional<ContentTextSubtitle> ();
+	stored = optional<ContentStringText> ();
 	while (!decoder->pass() && !stored) {}
 
 	BOOST_REQUIRE (stored);
@@ -110,12 +111,12 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
 	film->set_name ("frobozz");
 	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs ());
 
 	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
-	decoder->subtitle->TextStart.connect (bind (store, _1));
+	decoder->only_caption()->PlainStart.connect (bind (store, _1));
 
-	stored = optional<ContentTextSubtitle> ();
+	stored = optional<ContentStringText> ();
 	while (!decoder->pass ()) {
 		if (stored && stored->from() == ContentTime(0)) {
 			BOOST_CHECK_EQUAL (stored->subs.front().text(), "&lt;b&gt;Hello world!&lt;/b&gt;");
@@ -133,15 +134,15 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
 	film->set_interop (true);
 	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
 	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 ());
 
 	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
-	stored = optional<ContentTextSubtitle> ();
+	stored = optional<ContentStringText> ();
 	while (!decoder->pass ()) {
-		decoder->subtitle->TextStart.connect (bind (store, _1));
+		decoder->only_caption()->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 ();
@@ -157,3 +158,26 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
 		}
 	}
 }
+
+/** Check that Interop DCPs aren't made with more than one <LoadFont> (#1273) */
+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"));
+	film->examine_and_add_content (content);
+	shared_ptr<DCPSubtitleContent> content2 (new DCPSubtitleContent (film, "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")));
+
+	film->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs ());
+
+	cxml::Document doc ("DCSubtitle");
+	doc.read_file (subtitle_file (film));
+	BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
+}