Change video content scaling so that it either:

[dcpomatic.git] / test / remake_with_subtitle_test.cc

diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index bef1bc36a27f367d5312a163ebcc6334b1591ef5..2321653d9a19c77ade7ca3764ad022c12fd65253 100644 (file)
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -20,7 +20,7 @@
 
 #include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
-#include "lib/caption_content.h"
+#include "lib/text_content.h"
 #include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -34,19 +34,19 @@ using boost::dynamic_pointer_cast;
 BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
 {
        shared_ptr<Film> film = new_test_film2 ("remake_with_subtitle_test");
-       shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(content_factory(film, private_data / "prophet_short_clip.mkv").front());
+       shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data / "prophet_short_clip.mkv").front());
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
-       content->only_caption()->set_burn (true);
-       content->only_caption()->set_use (true);
+       content->only_text()->set_burn (true);
+       content->only_text()->set_use (true);
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs ());
 
        boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
 
-       content->only_caption()->set_use (false);
+       content->only_text()->set_use (false);
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       check_one_frame (film->dir(film->dcp_name()), 325, private_data / "prophet_frame_325_no_subs.j2c");
+       check_one_frame (film->dir(film->dcp_name()), 325, TestPaths::private_data / "prophet_frame_325_no_subs.j2c");
 }