diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-04-26 15:29:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-27 10:55:07 +0100 |
| commit | ba8a5a15cc27988e2bbc6acd470d8532f1d8e99f (patch) | |
| tree | 375bd068bbd86760f85fcd1264c1d8d76f2f1240 /test | |
| parent | f5a2789fcab274f2beda4a1e4ff59567158c9686 (diff) | |
Initial work on removing storage of subtitle times.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_subtitle_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 92a415ae1..927b8be69 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) wait_for_jobs (); shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log())); - decoder->subtitle->TextData.connect (bind (store, _1)); + decoder->subtitle->TextStart.connect (bind (store, _1)); stored = optional<ContentTextSubtitle> (); while (!decoder->pass() && !stored) {} @@ -106,11 +106,11 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) wait_for_jobs (); shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log())); - decoder->subtitle->TextData.connect (bind (store, _1)); + decoder->subtitle->TextStart.connect (bind (store, _1)); stored = optional<ContentTextSubtitle> (); while (!decoder->pass ()) { - if (stored && stored->period().from == ContentTime(0)) { + if (stored && stored->from() == ContentTime(0)) { BOOST_CHECK_EQUAL (stored->subs.front().text(), "<b>Hello world!</b>"); } } @@ -134,8 +134,8 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log())); stored = optional<ContentTextSubtitle> (); while (!decoder->pass ()) { - decoder->subtitle->TextData.connect (bind (store, _1)); - if (stored && stored->period().from == ContentTime::from_seconds(0.08)) { + decoder->subtitle->TextStart.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 (); BOOST_CHECK_EQUAL (i->text(), "This"); |