diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-18 23:13:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:36:56 +0100 |
| commit | 65cc06076b46cbd27ccfcf7387894358e2c8ab1e (patch) | |
| tree | 72eed4030fa0cf08190723410467645a1f199dd1 | |
| parent | 491edba4e79656a045103a284c65b846a167d2ff (diff) | |
Merge master.
| -rw-r--r-- | src/lib/dcp_text_decoder.cc | 2 | ||||
| -rw-r--r-- | test/dcp_subtitle_test.cc | 4 | ||||
| -rw-r--r-- | test/subtitle_charset_test.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcp_text_decoder.cc b/src/lib/dcp_text_decoder.cc index 741bbb8bc..576cfd357 100644 --- 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 c57d694d0..3d05e143d 100644 --- 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 822a78386..828411c9b 100644 --- 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); |