X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fplayer_test.cc;h=7cc846affec8bc344776f736ff6c49fa4defcab7;hb=a8d16fe03293100f1ee66cf48cd62433fcbaf7aa;hp=041bc3e81e91f67c95f7b2edd3932ee3505a07b0;hpb=dffc146e5387a0b3f7a671d845d6c3051b0e7067;p=dcpomatic.git

diff --git a/test/player_test.cc b/test/player_test.cc
index 041bc3e81..7cc846aff 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -31,10 +31,10 @@
 #include "lib/player.h"
 #include "lib/video_content.h"
 #include "lib/image_content.h"
-#include "lib/text_caption_file_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
-#include "lib/caption_content.h"
+#include "lib/text_content.h"
 #include "lib/butler.h"
 #include "lib/compose.hpp"
 #include "test.h"
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (film, "test/data/subrip.srt"));
+	shared_ptr<StringTextFileContent> s (new StringTextFileContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (s);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -211,11 +211,11 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 	shared_ptr<DCPContent> dcp (new DCPContent (film, private_data / "awkward_subs"));
 	film->examine_and_add_content (dcp, true);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	dcp->only_caption()->set_use (true);
+	dcp->only_text()->set_use (true);
 
 	shared_ptr<Player> player (new Player (film, film->playlist()));
 	player->set_fast ();
-	player->set_always_burn_open_captions ();
+	player->set_always_burn_open_subtitles ();
 	player->set_play_referenced ();
 
 	shared_ptr<Butler> butler (new Butler (player, film->log(), AudioMapping(), 2));
@@ -242,11 +242,11 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 	shared_ptr<DCPContent> dcp (new DCPContent (film, private_data / "awkward_subs2"));
 	film->examine_and_add_content (dcp, true);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	dcp->only_caption()->set_use (true);
+	dcp->only_text()->set_use (true);
 
 	shared_ptr<Player> player (new Player (film, film->playlist()));
 	player->set_fast ();
-	player->set_always_burn_open_captions ();
+	player->set_always_burn_open_subtitles ();
 	player->set_play_referenced ();
 
 	shared_ptr<Butler> butler (new Butler (player, film->log(), AudioMapping(), 2));