X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fburnt_subtitle_test.cc;h=38ce61326be1cb5ed0b534a312a2a912e105ff32;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=edad2c674ea8ae39ff07f6f29f5a2c06d31a692f;hpb=e52d9526f0a49acb72e8b4aa980399b119171ba5;p=dcpomatic.git

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index edad2c674..38ce61326 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -37,7 +37,7 @@
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
-#include <dcp/j2k.h>
+#include <dcp/j2k_transcode.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/mono_picture_asset_reader.h>
 #include <dcp/mono_picture_frame.h>
@@ -66,8 +66,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 	content->subtitle->set_burn (true);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film);
 
 	check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ()));
 }
@@ -83,8 +82,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 	content->subtitle->set_use (true);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film);
 
 	check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ()));
 }
@@ -96,10 +94,9 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	film->examine_and_add_content (content_factory(film, "test/data/flat_black.png").front());
-	BOOST_REQUIRE (!wait_for_jobs());
-	film->make_dcp ();
+	film->examine_and_add_content (content_factory(film, "test/data/flat_black.png")[0]);
 	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film);
 
 	Config::instance()->set_log_types (Config::instance()->log_types() | LogEntry::TYPE_DEBUG_ENCODE);
 	auto film2 = new_test_film ("burnt_subtitle_test_onto_dcp2");
@@ -109,14 +106,13 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	auto background_dcp = make_shared<DCPContent>(film2, film->dir(film->dcp_name()));
 	film2->examine_and_add_content (background_dcp);
 	auto sub = dynamic_pointer_cast<StringText> (
-		content_factory(film2, "test/data/subrip2.srt").front()
+		content_factory(film2, "test/data/subrip2.srt")[0]
 		);
 	sub->subtitle->set_burn (true);
 	sub->subtitle->set_outline (true);
 	film2->examine_and_add_content (sub);
 	BOOST_REQUIRE (!wait_for_jobs());
-	film2->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film2);
 
 	BOOST_CHECK (background_dcp->position() == DCPTime());
 	BOOST_CHECK (sub->position() == DCPTime());