diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-21 15:16:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-21 15:16:18 +0100 |
| commit | cbd4450197a083bf58bda510e626f73ba583cb66 (patch) | |
| tree | 2be308772512539570beab36beab02bde72d6d4b /test/dcp_subtitle_test.cc | |
| parent | 1013175d5f6adfa0e6a7442e4c9aebb893787748 (diff) | |
Basics of multiple captions per content so that DCPContent can
hold subs and closed captions.
Diffstat (limited to 'test/dcp_subtitle_test.cc')
| -rw-r--r-- | test/dcp_subtitle_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 48f88f8dc..3d4b57e3c 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -71,8 +71,8 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test) BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(2).get()); - content->caption->set_use (true); - content->caption->set_burn (false); + content->only_caption()->set_use (true); + content->only_caption()->set_burn (false); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs ()); @@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) BOOST_REQUIRE (!wait_for_jobs ()); shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false)); - decoder->caption->PlainStart.connect (bind (store, _1)); + decoder->only_caption()->PlainStart.connect (bind (store, _1)); stored = optional<ContentTextCaption> (); while (!decoder->pass() && !stored) {} @@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) BOOST_REQUIRE (!wait_for_jobs ()); shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log())); - decoder->caption->PlainStart.connect (bind (store, _1)); + decoder->only_caption()->PlainStart.connect (bind (store, _1)); stored = optional<ContentTextCaption> (); while (!decoder->pass ()) { @@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log())); stored = optional<ContentTextCaption> (); while (!decoder->pass ()) { - decoder->caption->PlainStart.connect (bind (store, _1)); + decoder->only_caption()->PlainStart.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 (); @@ -171,8 +171,8 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4) film->examine_and_add_content (content2); BOOST_REQUIRE (!wait_for_jobs ()); - content->caption->add_font (shared_ptr<Font> (new Font ("font1"))); - content2->caption->add_font (shared_ptr<Font> (new Font ("font2"))); + content->only_caption()->add_font (shared_ptr<Font> (new Font ("font1"))); + content2->only_caption()->add_font (shared_ptr<Font> (new Font ("font2"))); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs ()); |