X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=0c1f0716166eff0c0a1a9265ab1e736bb3195563;hb=cbecfe7ff652d61608f752239de8d134b052a28f;hp=6fe430d776f923b641e225bc64107021118a22fa;hpb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;p=dcpomatic.git diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index 6fe430d77..0c1f07161 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -24,7 +24,7 @@ */ #include "lib/film.h" -#include "lib/text_caption_file_content.h" +#include "lib/string_text_file_content.h" #include "lib/dcp_content_type.h" #include "lib/font.h" #include "lib/ratio.h" @@ -47,14 +47,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 TextCaptionFileContent (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->subtitle->set_use (true); - content->subtitle->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 +69,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 TextCaptionFileContent (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->subtitle->set_use (true); - content->subtitle->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->subtitle->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,15 +104,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3) film->set_name ("frobozz"); film->set_interop (true); film->set_audio_channels (6); - shared_ptr content (new TextCaptionFileContent (film, private_data / "Ankoemmling_short.srt")); + shared_ptr content (new StringTextFileContent(private_data / "Ankoemmling_short.srt")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - content->subtitle->set_use (true); - content->subtitle->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"); } @@ -125,13 +125,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 TextCaptionFileContent (film, "test/data/subrip2.srt")); - content->subtitle->set_use (true); - content->subtitle->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 +146,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5) film->set_name ("frobozz"); film->set_interop (true); film->set_sequence (false); - shared_ptr content (new TextCaptionFileContent (film, "test/data/subrip2.srt")); - content->subtitle->set_use (true); - content->subtitle->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 +164,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 TextCaptionFileContent (film, "test/data/frames.srt")); - content->subtitle->set_use (true); - content->subtitle->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,12 +185,12 @@ 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 TextCaptionFile (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)); shared_ptr decoder (new SubRipDecoder (content)); - list cts = decoder->get_plain_texts ( + list cts = decoder->get_plain_texts ( ContentTimePeriod ( ContentTime::from_seconds (109), ContentTime::from_seconds (110) ), false