diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-13 11:31:55 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-13 11:31:55 +0000 |
| commit | d15ef17dccf87b633d1971c38032a2049abe3db0 (patch) | |
| tree | 3bbde3c1959bae6b0ad064972f95bd9406416fbb /test/stl_text_reader_test.cc | |
| parent | acca8cb950de132fbc4be40e7dc7d294c6cb0a38 (diff) | |
Re-work time.
Diffstat (limited to 'test/stl_text_reader_test.cc')
| -rw-r--r-- | test/stl_text_reader_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/stl_text_reader_test.cc b/test/stl_text_reader_test.cc index c6f58b3..b99da2e 100644 --- a/test/stl_text_reader_test.cc +++ b/test/stl_text_reader_test.cc @@ -31,7 +31,7 @@ using std::vector; BOOST_AUTO_TEST_CASE (stl_text_reader_test) { ifstream file ("test/data/test_text.stl"); - sub::STLTextReader reader (file); + sub::STLTextReader reader (file, sub::TWENTY_FIVE); list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ()); list<sub::Subtitle>::iterator i = subs.begin (); @@ -40,8 +40,8 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) /* First subtitle */ BOOST_CHECK (i != subs.end ()); - BOOST_CHECK_EQUAL (i->from.frame().get(), sub::FrameTime (0, 0, 41, 9)); - BOOST_CHECK_EQUAL (i->to.frame().get(), sub::FrameTime (0, 0, 42, 21)); + BOOST_CHECK_EQUAL (i->from, sub::Time::from_hmsf (0, 0, 41, 9, sub::TWENTY_FIVE)); + BOOST_CHECK_EQUAL (i->to, sub::Time::from_hmsf (0, 0, 42, 21, sub::TWENTY_FIVE)); list<sub::Line>::iterator j = i->lines.begin (); BOOST_CHECK (j != i->lines.end ()); @@ -72,8 +72,8 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) /* Second subtitle */ BOOST_CHECK (i != subs.end ()); - BOOST_CHECK_EQUAL (i->from.frame().get(), sub::FrameTime (0, 1, 1, 1)); - BOOST_CHECK_EQUAL (i->to.frame().get(), sub::FrameTime (0, 1, 2, 10)); + BOOST_CHECK_EQUAL (i->from, sub::Time::from_hmsf (0, 1, 1, 1, sub::TWENTY_FIVE)); + BOOST_CHECK_EQUAL (i->to, sub::Time::from_hmsf (0, 1, 2, 10, sub::TWENTY_FIVE)); BOOST_CHECK_EQUAL (i->lines.size(), 1); sub::Line l = i->lines.front (); |