Merge.

[dcpomatic.git] / test / burnt_subtitle_test.cc

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index dc2c622704007b586ec73f94f4e0524304b3597f..e2f7272be87f3cd8a6f22d3db13e8dd857bd1101 100644 (file)
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -28,6 +28,7 @@
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "test.h"
+#include <iostream>
 
 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<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
-       content->set_subtitle_use (true);
-       film->examine_and_add_content (content);
+       content->set_use_subtitles (true);
+       content->set_burn_subtitles (true);
+       film->examine_and_add_content (content, true);
        wait_for_jobs ();
        film->make_dcp ();
        wait_for_jobs ();
@@ -59,8 +60,8 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
        film->set_name ("frobozz");
        film->set_burn_subtitles (true);
        shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml"));
-       content->set_subtitle_use (true);
-       film->examine_and_add_content (content);
+       content->set_use_subtitles (true);
+       film->examine_and_add_content (content, true);
        wait_for_jobs ();
        film->make_dcp ();
        wait_for_jobs ();