diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-03-20 23:43:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-03-24 16:59:24 +0100 |
| commit | 816a7b7a9d9c3cae7565cec139bf28068853f94d (patch) | |
| tree | 718644b178b68fd03e2b1ea18c7bec96da5de4e4 /test | |
| parent | e93b66f4236ec25dbd0603bbe74c904b53180e91 (diff) | |
Basic support for variable-Z 3D subtitles.
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpl_metadata_test.cc | 4 | ||||
| -rw-r--r-- | test/render_subtitles_test.cc | 6 | ||||
| -rw-r--r-- | test/subtitle_metadata_test.cc | 2 | ||||
| -rw-r--r-- | test/vf_test.cc | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc index 59ceed064..c0a3c658d 100644 --- a/test/cpl_metadata_test.cc +++ b/test/cpl_metadata_test.cc @@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(main_sound_configuration_test_51_vi) BOOST_REQUIRE(msc); /* We think this should say 51 not 71 at the start (#2580) */ - BOOST_CHECK_EQUAL(msc->to_string(), "51/L,R,C,LFE,Ls,Rs,-,VIN"); + BOOST_CHECK_EQUAL(msc->as_string(), "51/L,R,C,LFE,Ls,Rs,-,VIN"); } @@ -117,5 +117,5 @@ BOOST_AUTO_TEST_CASE(main_sound_configuration_test_71) auto msc = cpl->main_sound_configuration(); BOOST_REQUIRE(msc); - BOOST_CHECK_EQUAL(msc->to_string(), "71/L,R,C,LFE,Lss,Rss,-,VIN,-,-,Lrs,Rrs"); + BOOST_CHECK_EQUAL(msc->as_string(), "71/L,R,C,LFE,Lss,Rss,-,VIN,-,-,Lrs,Rrs"); } diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc index e89890542..1fe43c6d8 100644 --- a/test/render_subtitles_test.cc +++ b/test/render_subtitles_test.cc @@ -37,6 +37,9 @@ using std::make_shared; using std::shared_ptr; +using std::string; +using std::vector; +using boost::optional; static void @@ -59,6 +62,7 @@ add(std::vector<StringText>& s, std::string text, bool italic, bool bold, bool u 1, dcp::VAlign::TOP, 0, + vector<dcp::Text::VariableZPosition>(), dcp::Direction::LTR, text, dcp::Effect::NONE, @@ -133,6 +137,7 @@ BOOST_AUTO_TEST_CASE(render_text_with_newline_test) 0.5, dcp::HAlign::CENTER, 0.5, dcp::VAlign::CENTER, 0.0, + vector<dcp::Text::VariableZPosition>(), dcp::Direction::LTR, "Hello world", dcp::Effect::NONE, dcp::Colour(0, 0, 0), @@ -146,6 +151,7 @@ BOOST_AUTO_TEST_CASE(render_text_with_newline_test) 0.5, dcp::HAlign::CENTER, 0.5, dcp::VAlign::CENTER, 0.0, + vector<dcp::Text::VariableZPosition>(), dcp::Direction::LTR, "\n", dcp::Effect::NONE, dcp::Colour(0, 0, 0), diff --git a/test/subtitle_metadata_test.cc b/test/subtitle_metadata_test.cc index d8b887576..fcea278d7 100644 --- a/test/subtitle_metadata_test.cc +++ b/test/subtitle_metadata_test.cc @@ -50,6 +50,6 @@ BOOST_AUTO_TEST_CASE (subtitle_metadata_test1) auto langs = film->open_text_languages(); BOOST_REQUIRE (langs.first); - BOOST_CHECK_EQUAL (langs.first->to_string(), "de-DE"); + BOOST_CHECK_EQUAL(langs.first->as_string(), "de-DE"); } diff --git a/test/vf_test.cc b/test/vf_test.cc index cb5116910..2b59b68ba 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -59,6 +59,7 @@ using std::make_shared; using std::shared_ptr; using std::string; using std::vector; +using boost::optional; using namespace dcpomatic; @@ -465,7 +466,7 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels) 42, 1, dcp::Time(0, 0, 5, 0, 24), dcp::Time(0, 0, 9, 0, 24), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, - 0, dcp::Direction::LTR, + 0, vector<dcp::Text::VariableZPosition>(), dcp::Direction::LTR, "Hello", dcp::Effect::NONE, dcp::Colour(0, 0, 0), dcp::Time{}, dcp::Time{}, |