X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fburnt_subtitle_test.cc;h=91edcad9f46c4113080965a1c8746647a2bb60cd;hb=refs%2Fheads%2Fattic%2F800x600-buttons;hp=f0e60284b18d3a8a224af5b072e7e4c1cfe0a66e;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840;p=dcpomatic.git

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index f0e60284b..91edcad9f 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -23,7 +23,7 @@
  *  @ingroup specific
  */
 
-#include "lib/text_text_content.h"
+#include "lib/plain_text_content.h"
 #include "lib/dcp_text_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
@@ -59,13 +59,13 @@ 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<TextTextContent> content (new TextTextContent (film, "test/data/subrip2.srt"));
+	shared_ptr<StringText> content (new StringText (film, "test/data/subrip2.srt"));
 	content->subtitle->set_use (true);
 	content->subtitle->set_burn (true);
 	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());
 
 	check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ()));
 }
@@ -80,9 +80,9 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 	shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub.xml"));
 	content->subtitle->set_use (true);
 	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());
 
 	check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ()));
 }
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	film2->set_name ("frobozz");
 	shared_ptr<DCPContent> background_dcp (new DCPContent(film2, film->dir(film->dcp_name())));
 	film2->examine_and_add_content (background_dcp);
-	shared_ptr<TextTextContent> sub = dynamic_pointer_cast<TextTextContent> (
+	shared_ptr<StringText> sub = dynamic_pointer_cast<StringText> (
 		content_factory(film2, "test/data/subrip2.srt").front()
 		);
 	sub->subtitle->set_burn (true);