X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fsrt_subtitle_test.cc;h=a84c27c8233a2a9bf4f1b2392dbed604fba72ac6;hb=e81c5eb9e8ff875240dde9fdaaab0a46f99af615;hp=eb7918914323e9a000c71a693e70ab06282f9da6;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index eb7918914..a84c27c82 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -37,6 +37,7 @@ using std::string; using std::list; using boost::shared_ptr; +using namespace dcpomatic; /** Make a very short DCP with a single subtitle from .srt with no specified fonts */ BOOST_AUTO_TEST_CASE (srt_subtitle_test) @@ -47,14 +48,14 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test) film->set_name ("frobozz"); film->set_audio_channels (6); film->set_interop (false); - shared_ptr content (new StringTextFileContent (film, "test/data/subrip2.srt")); + shared_ptr content (new StringTextFileContent("test/data/subrip2.srt")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - content->only_caption()->set_use (true); - content->only_caption()->set_burn (false); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Should be blank video with a subtitle MXF */ check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ())); @@ -69,17 +70,17 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2) film->set_name ("frobozz"); film->set_audio_channels (6); film->set_interop (false); - shared_ptr content (new StringTextFileContent (film, "test/data/subrip2.srt")); + shared_ptr content (new StringTextFileContent ("test/data/subrip2.srt")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - content->only_caption()->set_use (true); - content->only_caption()->set_burn (false); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); /* Use test/data/subrip2.srt as if it were a font file */ - content->only_caption()->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt"); + content->only_text()->fonts().front()->set_file("test/data/subrip2.srt"); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Should be blank video with a subtitle MXF */ check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ())); @@ -104,17 +105,17 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3) film->set_name ("frobozz"); film->set_interop (true); film->set_audio_channels (6); - shared_ptr content (new StringTextFileContent (film, private_data / "Ankoemmling_short.srt")); + shared_ptr content (new StringTextFileContent(TestPaths::private_data / "Ankoemmling_short.srt")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - content->only_caption()->set_use (true); - content->only_caption()->set_burn (false); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - check_subtitle_file (film, private_data / "Ankoemmling_short.xml"); + check_subtitle_file (film, TestPaths::private_data / "Ankoemmling_short.xml"); } /** Build a small DCP with no picture and a single subtitle overlaid onto it */ @@ -125,13 +126,13 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); film->set_interop (false); - shared_ptr content (new StringTextFileContent (film, "test/data/subrip2.srt")); - content->only_caption()->set_use (true); - content->only_caption()->set_burn (false); + shared_ptr content (new StringTextFileContent("test/data/subrip2.srt")); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Should be blank video with MXF subtitles */ check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ())); @@ -146,15 +147,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5) film->set_name ("frobozz"); film->set_interop (true); film->set_sequence (false); - shared_ptr content (new StringTextFileContent (film, "test/data/subrip2.srt")); - content->only_caption()->set_use (true); - content->only_caption()->set_burn (false); + shared_ptr content (new StringTextFileContent("test/data/subrip2.srt")); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->examine_and_add_content (content); film->examine_and_add_content (content); - wait_for_jobs (); - content->set_position (DCPTime (0)); + BOOST_REQUIRE (!wait_for_jobs()); + content->set_position (film, DCPTime()); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); film->write_metadata (); check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ())); @@ -164,9 +165,9 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6) { shared_ptr film = new_test_film2 ("srt_subtitle_test6"); film->set_interop (false); - shared_ptr content (new StringTextFileContent (film, "test/data/frames.srt")); - content->only_caption()->set_use (true); - content->only_caption()->set_burn (false); + shared_ptr content (new StringTextFileContent("test/data/frames.srt")); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); film->make_dcp (); @@ -185,7 +186,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6) BOOST_AUTO_TEST_CASE (srt_subtitle_test4) { shared_ptr film = new_test_film ("subrip_render_test"); - shared_ptr content (new StringTextFile (film, "test/data/subrip.srt")); + shared_ptr content (new StringTextFile("test/data/subrip.srt")); content->examine (shared_ptr (), true); BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471));