X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=a84c27c8233a2a9bf4f1b2392dbed604fba72ac6;hb=b2c1e300844ae4a392f27e77c8c4d2af63d1dbbd;hp=3064abcc6e5cffd474200d7d27eb24f58130fee8;hpb=6cc7359c1af897f334dab5ba455707ce0c59af9d;p=dcpomatic.git

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 3064abcc6..a84c27c82 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -37,6 +37,7 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 /** Make a very short DCP with a single subtitle from .srt with no specified fonts */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test)
@@ -76,7 +77,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
 	/* Use test/data/subrip2.srt as if it were a font file  */
-	content->only_text()->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
+	content->only_text()->fonts().front()->set_file("test/data/subrip2.srt");
 
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -104,7 +105,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->set_name ("frobozz");
 	film->set_interop (true);
 	film->set_audio_channels (6);
-	shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "Ankoemmling_short.srt"));
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent(TestPaths::private_data / "Ankoemmling_short.srt"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -114,7 +115,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	check_subtitle_file (film, private_data / "Ankoemmling_short.xml");
+	check_subtitle_file (film, TestPaths::private_data / "Ankoemmling_short.xml");
 }
 
 /** Build a small DCP with no picture and a single subtitle overlaid onto it */