diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-01 13:03:38 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-07 17:01:06 +0200 |
| commit | 5a820bb8fae34591be5ac6d19a73461b9dab532a (patch) | |
| tree | 098e2dc959b6df0fefa62b2976976afc9f81b96b /test/srt_subtitle_test.cc | |
| parent | 9a7b67aee32a40539f29bc2d7017edd4a4f65f11 (diff) | |
Rearrange subtitle font management.
With this change each subtitle coming out of the player has a reference
to a dcpomatic::Font that belongs to the TextContent. This hopefully
solves a few problems which all basically stemmed from the fact that
previously the decoders/player were deciding what the font ID in the
output DCP would be - they can't do that properly.
Diffstat (limited to 'test/srt_subtitle_test.cc')
| -rw-r--r-- | test/srt_subtitle_test.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index cd4ce3a05..11b6b28b9 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -170,13 +170,14 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5) film->set_name ("frobozz"); film->set_interop (true); film->set_sequence (false); - auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt"); - content->only_text()->set_use (true); - content->only_text()->set_burn (false); - film->examine_and_add_content (content); - film->examine_and_add_content (content); - BOOST_REQUIRE (!wait_for_jobs()); - content->set_position (film, DCPTime()); + for (auto i = 0; i < 2; ++i) { + auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt"); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); + film->examine_and_add_content (content); + BOOST_REQUIRE (!wait_for_jobs()); + content->set_position (film, DCPTime()); + } make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD}); check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ())); |