diff options
Diffstat (limited to 'test/dcp_subtitle_test.cc')
| -rw-r--r-- | test/dcp_subtitle_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 3d4b57e3c..2dbf43b2a 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -31,10 +31,10 @@ #include "lib/dcp_decoder.h" #include "lib/dcp_content_type.h" #include "lib/dcp_subtitle_decoder.h" -#include "lib/caption_content.h" -#include "lib/content_caption.h" +#include "lib/text_content.h" +#include "lib/content_text.h" #include "lib/font.h" -#include "lib/caption_decoder.h" +#include "lib/text_decoder.h" #include "test.h" #include <iostream> @@ -43,10 +43,10 @@ using std::list; using boost::shared_ptr; using boost::optional; -optional<ContentTextCaption> stored; +optional<ContentStringText> stored; static void -store (ContentTextCaption sub) +store (ContentStringText 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->only_caption()->PlainStart.connect (bind (store, _1)); - stored = optional<ContentTextCaption> (); + stored = optional<ContentStringText> (); while (!decoder->pass() && !stored) {} BOOST_REQUIRE (stored); @@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log())); decoder->only_caption()->PlainStart.connect (bind (store, _1)); - stored = optional<ContentTextCaption> (); + stored = optional<ContentStringText> (); 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<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log())); - stored = optional<ContentTextCaption> (); + stored = optional<ContentStringText> (); while (!decoder->pass ()) { decoder->only_caption()->PlainStart.connect (bind (store, _1)); if (stored && stored->from() == ContentTime::from_seconds(0.08)) { |