X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=7cc846affec8bc344776f736ff6c49fa4defcab7;hb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;hp=915dab4f74a065d96562ef0fe0d10473b86b2f2a;hpb=c1f98c84cdf3829b31929453b8a89fdcbdcd0c42;p=dcpomatic.git

diff --git a/test/player_test.cc b/test/player_test.cc
index 915dab4f7..7cc846aff 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -31,7 +31,7 @@
 #include "lib/player.h"
 #include "lib/video_content.h"
 #include "lib/image_content.h"
-#include "lib/plain_text_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/text_content.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<PlainText> s (new PlainText (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->subtitle->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_subtitles (true);
+	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->subtitle->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_subtitles (true);
+	player->set_always_burn_open_subtitles ();
 	player->set_play_referenced ();
 
 	shared_ptr<Butler> butler (new Butler (player, film->log(), AudioMapping(), 2));