X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=b86a944037a6f586842f8b49f599660ca4680a00;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hp=52f3097cbf891f8963db5ad838884f11ef17e108;hpb=80908df324b330dc35d7e70b69ae5fce0dcfbab1;p=dcpomatic.git

diff --git a/test/player_test.cc b/test/player_test.cc
index 52f3097cb..b86a94403 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_subtitle_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
-#include "lib/subtitle_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<TextSubtitleContent> s (new TextSubtitleContent (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_caption()->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_captions ();
 	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_caption()->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_captions ();
 	player->set_play_referenced ();
 
 	shared_ptr<Butler> butler (new Butler (player, film->log(), AudioMapping(), 2));