X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_charset_test.cc;h=9247aec4a828150410694c0f1d57ecdd55861b67;hb=0a1d944d74308ccb940194bcb627652c72128650;hp=3e7df0a61bfd0718de287ff942657e6d92952be0;hpb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;p=dcpomatic.git

diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc
index 3e7df0a61..9247aec4a 100644
--- a/test/subtitle_charset_test.cc
+++ b/test/subtitle_charset_test.cc
@@ -22,8 +22,8 @@
 #include "lib/content.h"
 #include "lib/film.h"
 #include "lib/content_factory.h"
-#include "lib/plain_text_file.h"
-#include "lib/text_caption_file_content.h"
+#include "lib/string_text_file.h"
+#include "lib/string_text_file_content.h"
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
@@ -33,7 +33,7 @@ using boost::dynamic_pointer_cast;
 BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
 {
 	shared_ptr<Film> film = new_test_film2 ("subtitle_charset_test1");
-	shared_ptr<Content> content = content_factory (film, private_data / "PADDINGTON soustitresVFdef.srt").front ();
+	shared_ptr<Content> content = content_factory (TestPaths::private_data / "PADDINGTON soustitresVFdef.srt").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 }
@@ -42,11 +42,11 @@ BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
 BOOST_AUTO_TEST_CASE (subtitle_charset_test2)
 {
 	shared_ptr<Film> film = new_test_film2 ("subtitle_charset_test2");
-	shared_ptr<Content> content = content_factory (film, "test/data/osx.srt").front ();
+	shared_ptr<Content> content = content_factory ("test/data/osx.srt").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	shared_ptr<TextCaptionFile> ts = dynamic_pointer_cast<TextCaptionFile> (content);
+	shared_ptr<StringTextFileContent> ts = dynamic_pointer_cast<StringTextFileContent> (content);
 	BOOST_REQUIRE (ts);
 	/* Make sure we got the subtitle data from the file */
-	BOOST_REQUIRE_EQUAL (content->full_length().get(), 6052032);
+	BOOST_REQUIRE_EQUAL (content->full_length(film).get(), 6052032);
 }