Rename some methods.

[dcpomatic.git] / test / dcp_subtitle_test.cc

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 9007ad6114ac2ce418121019fbb7be17f119aa63..5d77681e9ab7a0a70c9ea260029e2e223d002001 100644 (file)
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -28,7 +28,11 @@
 #include "lib/ratio.h"
 #include "lib/dcp_decoder.h"
 #include "lib/dcp_content_type.h"
+#include "lib/subtitle_content.h"
+#include "lib/content_subtitle.h"
+#include "lib/subtitle_decoder.h"
 #include "test.h"
+#include <iostream>
 
 using std::cout;
 using std::list;
@@ -47,8 +51,8 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 
        BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
 
-       content->set_use_subtitles (true);
-       content->set_burn_subtitles (false);
+       content->subtitle->set_use (true);
+       content->subtitle->set_burn (false);
        film->make_dcp ();
        wait_for_jobs ();
 
@@ -66,7 +70,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
        film->examine_and_add_content (content);
        wait_for_jobs ();
 
-       shared_ptr<DCPDecoder> decoder (new DCPDecoder (content));
+       shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false));
 
        list<ContentTimePeriod> ctp = decoder->text_subtitles_during (
                ContentTimePeriod (
@@ -82,11 +86,12 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
        BOOST_CHECK_EQUAL (ctp.back().from, ContentTime::from_seconds (25 + 12 * 0.04));
        BOOST_CHECK_EQUAL (ctp.back().to, ContentTime::from_seconds (26 + 4 * 0.04));
 
-       list<ContentTextSubtitle> subs = decoder->get_text_subtitles (
+       list<ContentTextSubtitle> subs = decoder->subtitle->get_text (
                ContentTimePeriod (
                        ContentTime::from_seconds (25),
                        ContentTime::from_seconds (26)
                        ),
+               true,
                true
                );