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

diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index f6c65b1af..c07666aa0 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -18,12 +18,17 @@
 
 */
 
+/** @file  test/ssa_subtitle_test.cc
+ *  @brief Test use of SSA subtitle files.
+ *  @ingroup feature
+ */
+
 #include "lib/film.h"
-#include "lib/text_subtitle_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/subtitle_content.h"
+#include "lib/text_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -42,34 +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<TextSubtitleContent> content (new TextSubtitleContent (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 */
-	for (
-		boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory() / film->dcp_name (false));
-		i != boost::filesystem::directory_iterator ();
-		++i) {
-
-		if (boost::filesystem::is_directory (i->path ())) {
-			for (
-				boost::filesystem::directory_iterator j = boost::filesystem::directory_iterator (i->path ());
-				j != boost::filesystem::directory_iterator ();
-				++j) {
-
-				if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
-					list<string> ignore;
-					ignore.push_back ("SubtitleID");
-					check_xml (*j, private_data / "DKH_UT_EN20160601def.xml", ignore);
-				}
-			}
-		}
-	}
+	list<string> ignore;
+	ignore.push_back ("SubtitleID");
+	check_xml (subtitle_file(film), TestPaths::private_data() / "DKH_UT_EN20160601def.xml", ignore);
 }