X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fremake_with_subtitle_test.cc;h=3b6cf930c8a71bb87fbc8b6dcf84ff281aa80bd8;hp=5c371e855b03b580c353509464bdc3f0683047d5;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1

diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 5c371e855..3b6cf930c 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,35 +18,36 @@
 
 */
 
+
 #include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
-#include "lib/caption_content.h"
+#include "lib/text_content.h"
 #include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+
 
 /** Check that if we remake a DCP having turned off subtitles the code notices
  *  and doesn't re-use the old video data.
  */
 BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
 {
-	shared_ptr<Film> film = new_test_film2 ("remake_with_subtitle_test");
-	shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(content_factory(film, private_data / "prophet_short_clip.mkv").front());
+	auto film = new_test_film2 ("remake_with_subtitle_test");
+	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv").front());
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	content->caption->set_burn (true);
-	content->caption->set_use (true);
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs ());
+	content->only_text()->set_burn (true);
+	content->only_text()->set_use (true);
+	make_and_verify_dcp (film);
 
 	boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
 
-	content->caption->set_use (false);
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs ());
+	content->only_text()->set_use (false);
+	make_and_verify_dcp (film);
 
-	check_one_frame (film->dir(film->dcp_name()), 325, private_data / "prophet_frame_325_no_subs.j2c");
+	check_one_frame (film->dir(film->dcp_name()), 325, TestPaths::private_data() / "prophet_frame_325_no_subs.j2c");
 }