More automated renaming.

[dcpomatic.git] / test / reels_test.cc

diff --git a/test/reels_test.cc b/test/reels_test.cc
index bd7b1c06a05c8c9f6372fa9b2d604aa804797444..76dbb61ed82e3956a8bce1e9117e652c4f23f99b 100644 (file)
--- 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/string_text_file_content.h"
 #include "lib/content_factory.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -91,6 +91,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
        shared_ptr<Film> film = new_test_film ("reels_test2");
        film->set_name ("reels_test2");
        film->set_container (Ratio::from_id ("185"));
+       film->set_interop (false);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 
        {
@@ -164,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 StringTextFileContent (film, "test/data/subrip.srt"));
        film->examine_and_add_content (sub);
        wait_for_jobs ();
 
@@ -194,6 +195,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       film->set_interop (false);
 
        /* 4 piece of 1s-long content */
        shared_ptr<ImageContent> content[4];
@@ -204,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<StringTextFileContent> subs (new StringTextFileContent (film, "test/data/subrip3.srt"));
        film->examine_and_add_content (subs);
        wait_for_jobs ();
 
@@ -231,13 +233,14 @@ 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 123 but it will be rounded up to the next frame (4000) */
-       dcp->set_position(DCPTime(123));
+       /* Set to 2123 but it will be rounded up to the next frame (4000) */
+       dcp->set_position(DCPTime(2123));
 
        {
                list<DCPTimePeriod> p = dcp->reels ();
@@ -340,7 +343,6 @@ BOOST_AUTO_TEST_CASE (reels_test8)
        BOOST_REQUIRE (!wait_for_jobs ());
 
        A->set_trim_end (ContentTime::from_seconds (1));
-       cout << to_string(A->length_after_trim()) << "\n";
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs ());
 }