X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fssa_subtitle_test.cc;h=c61d34b7149f2c7cbd44054fd87b62752ed1345c;hb=0e6d4402c013eb6be666b5f638dd932052ae6c51;hp=6d4eecd92411e247b965540a834aadbb89940b7a;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1;p=dcpomatic.git

diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index 6d4eecd92..c61d34b71 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -24,11 +24,11 @@
  */
 
 #include "lib/film.h"
-#include "lib/text_caption_file_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
-#include "lib/caption_content.h"
+#include "lib/text_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -47,15 +47,15 @@ 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<TextCaptionFileContent> content (new TextCaptionFileContent (film, private_data / "DKH_UT_EN20160601def.ssa"));
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "DKH_UT_EN20160601def.ssa"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
-	content->caption->set_use (true);
-	content->caption->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;