X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fremake_with_subtitle_test.cc;h=81738c2eab005a94647983bdf11005e1bfffcea9;hp=eb9ab568cdab883119aec8889c59c4d360e67030;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=d12cf77f25e6e39fbfd4b249690149309a21646e

diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index eb9ab568c..81738c2ea 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -20,28 +20,33 @@
 
 #include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
-#include "lib/subtitle_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());
+	shared_ptr<FFmpegContent> 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->subtitle->set_burn (true);
-	content->subtitle->set_use (true);
+	content->only_text()->set_burn (true);
+	content->only_text()->set_use (true);
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
 
-	content->subtitle->set_use (false);
+	content->only_text()->set_use (false);
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
+
+	check_one_frame (film->dir(film->dcp_name()), 325, TestPaths::private_data() / "prophet_frame_325_no_subs.j2c");
 }