X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freels_test.cc;h=f793cef1d32f4ec5355cf1b7352dbb0394c26b17;hp=b8a0b0a60851ecff8686786e8a1dead183037d69;hb=d7ac100c0eb1b5efdcfbec59be870fd869252840;hpb=aef39b9a3ff1801d0f84b652204442476d71a5bd

diff --git a/test/reels_test.cc b/test/reels_test.cc
index b8a0b0a60..f793cef1d 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -30,7 +30,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"
 #include "lib/video_content.h"
-#include "lib/text_subtitle_content.h"
+#include "lib/text_text_content.h"
 #include "lib/content_factory.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE (reels_test3)
 
 	shared_ptr<Content> dcp (new DCPContent (film, "test/data/reels_test2"));
 	film->examine_and_add_content (dcp);
-	shared_ptr<Content> sub (new TextSubtitleContent (film, "test/data/subrip.srt"));
+	shared_ptr<Content> sub (new TextTextContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (sub);
 	wait_for_jobs ();
 
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 		content[i]->video->set_length (24);
 	}
 
-	shared_ptr<TextSubtitleContent> subs (new TextSubtitleContent (film, "test/data/subrip3.srt"));
+	shared_ptr<TextTextContent> subs (new TextTextContent (film, "test/data/subrip3.srt"));
 	film->examine_and_add_content (subs);
 	wait_for_jobs ();
 
@@ -233,10 +233,11 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 
 BOOST_AUTO_TEST_CASE (reels_test5)
 {
-	shared_ptr<Film> film = new_test_film ("reels_test4");
+	shared_ptr<Film> film = new_test_film ("reels_test5");
+	film->set_sequence (false);
 	shared_ptr<DCPContent> dcp (new DCPContent (film, "test/data/reels_test4"));
 	film->examine_and_add_content (dcp);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs ());
 
 	/* Set to 2123 but it will be rounded up to the next frame (4000) */
 	dcp->set_position(DCPTime(2123));