Allow repeat-frame to work with 3D.

[dcpomatic.git] / test / dcp_subtitle_test.cc

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 92a415ae121fc309f2cc7ae0bd2e80ccee342915..927b8be69c32d28c6ebfb594006693f30abfea4c 100644 (file)
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
        wait_for_jobs ();
 
        shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log()));
-       decoder->subtitle->TextData.connect (bind (store, _1));
+       decoder->subtitle->TextStart.connect (bind (store, _1));
 
        stored = optional<ContentTextSubtitle> ();
        while (!decoder->pass() && !stored) {}
@@ -106,11 +106,11 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
        wait_for_jobs ();
 
        shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
-       decoder->subtitle->TextData.connect (bind (store, _1));
+       decoder->subtitle->TextStart.connect (bind (store, _1));
 
        stored = optional<ContentTextSubtitle> ();
        while (!decoder->pass ()) {
-               if (stored && stored->period().from == ContentTime(0)) {
+               if (stored && stored->from() == ContentTime(0)) {
                        BOOST_CHECK_EQUAL (stored->subs.front().text(), "&lt;b&gt;Hello world!&lt;/b&gt;");
                }
        }
@@ -134,8 +134,8 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
        shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
        stored = optional<ContentTextSubtitle> ();
        while (!decoder->pass ()) {
-               decoder->subtitle->TextData.connect (bind (store, _1));
-               if (stored && stored->period().from == ContentTime::from_seconds(0.08)) {
+               decoder->subtitle->TextStart.connect (bind (store, _1));
+               if (stored && stored->from() == ContentTime::from_seconds(0.08)) {
                        list<dcp::SubtitleString> s = stored->subs;
                        list<dcp::SubtitleString>::const_iterator i = s.begin ();
                        BOOST_CHECK_EQUAL (i->text(), "This");