X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fremake_with_subtitle_test.cc;h=399796698dc646c0dc2a1d60e92717d83e2a5f73;hb=8c0414a0dec9f444a80fc30c7be3bc82188446d4;hp=0190e9837c0f4150c12500d288aead3bbee7eb7b;hpb=ba9663eae697ec16c3a4ee0fa029d705f0c298cc;p=dcpomatic.git

diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 0190e9837..399796698 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -20,7 +20,7 @@
 
 #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>
@@ -28,23 +28,25 @@
 using boost::shared_ptr;
 using boost::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(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 ());
 
-	/* Nothing is being checked here so this test is not complete */
-	DCPOMATIC_ASSERT (false);
+	check_one_frame (film->dir(film->dcp_name()), 325, private_data / "prophet_frame_325_no_subs.j2c");
 }