From 62c12efaff503fc6e7e41a50382f985eb2239d5f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 28 Jan 2025 17:19:07 +0100 Subject: Fix failure to reset horizontal alignment after a .srt subtitles (DoM #2960). --- test/data/test3.srt | 15 +++++++++++++++ test/subrip_reader_test.cc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 test/data/test3.srt (limited to 'test') diff --git a/test/data/test3.srt b/test/data/test3.srt new file mode 100644 index 0000000..39b3769 --- /dev/null +++ b/test/data/test3.srt @@ -0,0 +1,15 @@ +1 +00:01:49,200 --> 00:01:52,351 +{\an1}Let's go bottom left + +2 +00:01:52,440 --> 00:01:54,351 +Now back to the middle + +3 +00:01:54,440 --> 00:01:56,590 +{\an9}And top right + +4 +00:01:56,680 --> 00:01:58,955 +And here we are again diff --git a/test/subrip_reader_test.cc b/test/subrip_reader_test.cc index ef76eda..319bbb1 100644 --- a/test/subrip_reader_test.cc +++ b/test/subrip_reader_test.cc @@ -707,3 +707,33 @@ BOOST_AUTO_TEST_CASE(subrip_with_unicode_line_separator_test) BOOST_CHECK_EQUAL(subs[1].lines[1].blocks[0].text, "wenn du dich bewegst."); } + + +BOOST_AUTO_TEST_CASE(subrip_returns_to_bottom_middle) +{ + auto f = fopen("test/data/test3.srt", "r"); + BOOST_REQUIRE(f); + sub::SubripReader reader(f); + fclose(f); + auto subs = sub::collect>(reader.subtitles()); + + BOOST_REQUIRE_EQUAL(subs.size(), 4U); + + BOOST_REQUIRE_EQUAL(subs[0].lines.size(), 1U); + BOOST_REQUIRE_EQUAL(subs[0].lines[0].blocks.size(), 1U); + BOOST_CHECK_EQUAL(subs[0].lines[0].blocks[0].text, "Let's go bottom left"); + BOOST_CHECK(subs[0].lines[0].horizontal_position.reference == sub::HorizontalReference::LEFT_OF_SCREEN); + + BOOST_REQUIRE_EQUAL(subs[1].lines[0].blocks.size(), 1U); + BOOST_CHECK_EQUAL(subs[1].lines[0].blocks[0].text, "Now back to the middle"); + BOOST_CHECK(subs[1].lines[0].horizontal_position.reference == sub::HorizontalReference::HORIZONTAL_CENTRE_OF_SCREEN); + + BOOST_REQUIRE_EQUAL(subs[2].lines[0].blocks.size(), 1U); + BOOST_CHECK_EQUAL(subs[2].lines[0].blocks[0].text, "And top right"); + BOOST_CHECK(subs[2].lines[0].horizontal_position.reference == sub::HorizontalReference::RIGHT_OF_SCREEN); + + BOOST_REQUIRE_EQUAL(subs[3].lines[0].blocks.size(), 1U); + BOOST_CHECK_EQUAL(subs[3].lines[0].blocks[0].text, "And here we are again"); + BOOST_CHECK(subs[3].lines[0].horizontal_position.reference == sub::HorizontalReference::HORIZONTAL_CENTRE_OF_SCREEN); +} + -- cgit v1.2.3