X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fburnt_subtitle_test.cc;h=fc5b885780d11dc71d9b6b36b0449b3efd8b06fa;hb=80400212e939dc2f3b987cb6df57709929aa5178;hp=d10d1ed25239e54dac342c0bce6bcef40d0a94d6;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2;p=dcpomatic.git diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc index d10d1ed25..fc5b88578 100644 --- a/test/burnt_subtitle_test.cc +++ b/test/burnt_subtitle_test.cc @@ -22,12 +22,13 @@ */ #include -#include "lib/subrip_content.h" +#include "lib/text_subtitle_content.h" #include "lib/dcp_subtitle_content.h" #include "lib/film.h" #include "lib/ratio.h" #include "lib/dcp_content_type.h" #include "test.h" +#include using std::cout; using boost::shared_ptr; @@ -39,10 +40,10 @@ 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"); - film->set_burn_subtitles (true); - shared_ptr content (new SubRipContent (film, "test/data/subrip2.srt")); + shared_ptr content (new TextSubtitleContent (film, "test/data/subrip2.srt")); content->set_use_subtitles (true); - film->examine_and_add_content (content); + content->set_burn_subtitles (true); + film->examine_and_add_content (content, true); wait_for_jobs (); film->make_dcp (); wait_for_jobs (); @@ -60,7 +61,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp) film->set_burn_subtitles (true); shared_ptr content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml")); content->set_use_subtitles (true); - film->examine_and_add_content (content); + film->examine_and_add_content (content, true); wait_for_jobs (); film->make_dcp (); wait_for_jobs ();