X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fssa_subtitle_test.cc;h=c07666aa04469e49aeb66a499028c96dc1dddd49;hb=8611fc8597605aa51373adb4fc8f0c697b8c7360;hp=536a3ce6a31c3f379001cbb55f9b655f090d8bea;hpb=507a389e9c5f84ec1d51e7566e38fbf42f658537;p=dcpomatic.git

diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index 536a3ce6a..c07666aa0 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -20,11 +20,11 @@
 
 /** @file  test/ssa_subtitle_test.cc
  *  @brief Test use of SSA subtitle files.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/film.h"
-#include "lib/plain_text_file_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
@@ -47,18 +47,18 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_interop (true);
-	shared_ptr<PlainTextFileContent> content (new PlainTextFileContent (film, private_data / "DKH_UT_EN20160601def.ssa"));
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent(TestPaths::private_data() / "DKH_UT_EN20160601def.ssa"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
-	content->subtitle->set_use (true);
-	content->subtitle->set_burn (false);
+	content->only_text()->set_use (true);
+	content->only_text()->set_burn (false);
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Find the subtitle file and check it */
 	list<string> ignore;
 	ignore.push_back ("SubtitleID");
-	check_xml (subtitle_file(film), private_data / "DKH_UT_EN20160601def.xml", ignore);
+	check_xml (subtitle_file(film), TestPaths::private_data() / "DKH_UT_EN20160601def.xml", ignore);
 }