diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-01-28 17:19:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-01-29 02:04:33 +0100 |
| commit | 62c12efaff503fc6e7e41a50382f985eb2239d5f (patch) | |
| tree | 438ea4b262be6f69ef8598af03a75875ccd57a7f | |
| parent | ed7db4de16af9f6a0e17f4469aed22a8f6fa17e0 (diff) | |
Fix failure to reset horizontal alignment after a .srt subtitles (DoM #2960).
| -rw-r--r-- | src/subrip_reader.cc | 10 | ||||
| -rw-r--r-- | test/data/test3.srt | 15 | ||||
| -rw-r--r-- | test/subrip_reader_test.cc | 30 |
3 files changed, 52 insertions, 3 deletions
diff --git a/src/subrip_reader.cc b/src/subrip_reader.cc index 7412474..73af9ee 100644 --- a/src/subrip_reader.cc +++ b/src/subrip_reader.cc @@ -71,10 +71,14 @@ SubripReader::read (function<optional<string> ()> get_line) CONTENT } state = COUNTER; - RawSubtitle rs; - rs.vertical_position.line = 0; - rs.vertical_position.reference = TOP_OF_SUBTITLE; + auto prepare = [](RawSubtitle& rs) { + rs.vertical_position.line = 0; + rs.vertical_position.reference = TOP_OF_SUBTITLE; + }; + + RawSubtitle rs; + prepare(rs); while (true) { auto line = get_line (); 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<std::vector<sub::Subtitle>>(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); +} + |