diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-02 21:23:03 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-02 21:23:03 +0000 |
| commit | 308fb04d15cecb471c8c04db40d2979810efefe3 (patch) | |
| tree | 16ccb47c3e0886d406ba6f70ad16d7403d0a809b | |
| parent | 9aec1f8069ab8d08d79e0021157d85991de6535e (diff) | |
Fix incorrect test subtitle gathering; fix a few missing standard-setting calls.
| -rw-r--r-- | test/dcp_subtitle_test.cc | 9 | ||||
| -rw-r--r-- | test/scaling_test.cc | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index b4dfe1df7..407ac2616 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -47,7 +47,13 @@ optional<ContentTextSubtitle> stored; static void store (ContentTextSubtitle sub) { - stored = sub; + if (!stored) { + stored = sub; + } else { + BOOST_FOREACH (dcp::SubtitleString i, sub.subs) { + stored->subs.push_back (i); + } + } } /** Test pass-through of a very simple DCP subtitle file */ @@ -57,6 +63,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); + film->set_interop (false); shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml")); film->examine_and_add_content (content); wait_for_jobs (); diff --git a/test/scaling_test.cc b/test/scaling_test.cc index 13276977d..ed0461005 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -38,6 +38,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content { content->video->set_scale (VideoContentScale (Ratio::from_id (image))); film->set_container (Ratio::from_id (container)); + film->set_interop (false); film->make_dcp (); wait_for_jobs (); |