X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fburnt_subtitle_test.cc;h=91edcad9f46c4113080965a1c8746647a2bb60cd;hb=d31bb9dd64630718fe7faa607e61be7ba88e9097;hp=8ca43620757006cbc9afd532272d70c904ccd8fe;hpb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;p=dcpomatic.git diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc index 8ca436207..91edcad9f 100644 --- a/test/burnt_subtitle_test.cc +++ b/test/burnt_subtitle_test.cc @@ -59,13 +59,13 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - shared_ptr content (new TextCaption (film, "test/data/subrip2.srt")); + shared_ptr content (new StringText (film, "test/data/subrip2.srt")); content->subtitle->set_use (true); content->subtitle->set_burn (true); 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()); check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ())); } @@ -80,9 +80,9 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp) shared_ptr content (new DCPTextContent (film, "test/data/dcp_sub.xml")); content->subtitle->set_use (true); 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()); check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ())); } @@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp) film2->set_name ("frobozz"); shared_ptr background_dcp (new DCPContent(film2, film->dir(film->dcp_name()))); film2->examine_and_add_content (background_dcp); - shared_ptr sub = dynamic_pointer_cast ( + shared_ptr sub = dynamic_pointer_cast ( content_factory(film2, "test/data/subrip2.srt").front() ); sub->subtitle->set_burn (true);