Merge master.

diff --git a/src/lib/dcp_text_decoder.cc b/src/lib/dcp_text_decoder.cc
index 741bbb8bcf9c39a6b74d54cd42ee7dbed6f490c4..576cfd3579b475d70549f6164f26be03eb14b653 100644 (file)
--- a/src/lib/dcp_text_decoder.cc
+++ b/src/lib/dcp_text_decoder.cc
@@ -86,7 +86,7 @@ DCPTextDecoder::pass ()
 }
 
 ContentTimePeriod
-DCPTextDecoder::content_time_period (shared_ptr<dcp::SubtitleString> s) const
+DCPTextDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
 {
        return ContentTimePeriod (
                ContentTime::from_seconds (s->in().as_seconds ()),

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index c57d694d0718c2c477f5f3126b564a441dd70344..3d05e143dd544b86738e00f313ef837d6ff07dcd 100644 (file)
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -165,9 +165,9 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
        shared_ptr<Film> film = new_test_film2 ("dcp_subtitle_test4");
        film->set_interop (true);
 
-       shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
+       shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub3.xml"));
        film->examine_and_add_content (content);
-       shared_ptr<DCPSubtitleContent> content2 (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
+       shared_ptr<DCPTextContent> content2 (new DCPTextContent (film, "test/data/dcp_sub3.xml"));
        film->examine_and_add_content (content2);
        BOOST_REQUIRE (!wait_for_jobs ());
 

diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc
index 822a783864315d08f565f5c3edcd1d083fd4fb93..828411c9b5236d9fb1995980a45334328f0c80f7 100644 (file)
--- a/test/subtitle_charset_test.cc
+++ b/test/subtitle_charset_test.cc
@@ -23,7 +23,7 @@
 #include "lib/film.h"
 #include "lib/content_factory.h"
 #include "lib/text_subtitle.h"
-#include "lib/text_subtitle_content.h"
+#include "lib/text_text_content.h"
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (subtitle_charset_test2)
        shared_ptr<Content> content = content_factory (film, "test/data/osx.srt").front ();
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
-       shared_ptr<TextSubtitleContent> ts = dynamic_pointer_cast<TextSubtitleContent> (content);
+       shared_ptr<TextTextContent> ts = dynamic_pointer_cast<TextTextContent> (content);
        BOOST_REQUIRE (ts);
        /* Make sure we got the subtitle data from the file */
        BOOST_REQUIRE_EQUAL (content->full_length().get(), 6052032);