diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 13:44:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | 491176352b80bea000564e6662738722185be721 (patch) | |
| tree | 34211a43cefdec49f43b4a990897fdb4102a5aa2 /test/dcp_subtitle_test.cc | |
| parent | 0fb9916d6734dbea4cb55b6d42923468aee45a40 (diff) | |
Remove old content_subtitle.
Diffstat (limited to 'test/dcp_subtitle_test.cc')
| -rw-r--r-- | test/dcp_subtitle_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 026fbd12a..9ea708ed5 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -32,7 +32,7 @@ #include "lib/dcp_content_type.h" #include "lib/dcp_text_decoder.h" #include "lib/text_content.h" -#include "lib/content_subtitle.h" +#include "lib/content_text.h" #include "lib/font.h" #include "lib/text_decoder.h" #include "test.h" @@ -43,10 +43,10 @@ using std::list; using boost::shared_ptr; using boost::optional; -optional<ContentTextSubtitle> stored; +optional<ContentPlainText> stored; static void -store (ContentTextSubtitle sub) +store (ContentPlainText sub) { if (!stored) { stored = sub; @@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false)); decoder->subtitle->PlainStart.connect (bind (store, _1)); - stored = optional<ContentTextSubtitle> (); + stored = optional<ContentPlainText> (); while (!decoder->pass() && !stored) {} BOOST_REQUIRE (stored); @@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) shared_ptr<DCPTextDecoder> decoder (new DCPTextDecoder (content, film->log())); decoder->subtitle->PlainStart.connect (bind (store, _1)); - stored = optional<ContentTextSubtitle> (); + stored = optional<ContentPlainText> (); while (!decoder->pass ()) { if (stored && stored->from() == ContentTime(0)) { BOOST_CHECK_EQUAL (stored->subs.front().text(), "<b>Hello world!</b>"); @@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) BOOST_REQUIRE (!wait_for_jobs ()); shared_ptr<DCPTextDecoder> decoder (new DCPTextDecoder (content, film->log())); - stored = optional<ContentTextSubtitle> (); + stored = optional<ContentPlainText> (); while (!decoder->pass ()) { decoder->subtitle->PlainStart.connect (bind (store, _1)); if (stored && stored->from() == ContentTime::from_seconds(0.08)) { |