Time -> FrameTime.

2 files changed, 45 insertions, 27 deletions

diff --git a/test/stl_reader_test.cc b/test/stl_reader_test.cc
index 92b0d58..7481ecf 100644
--- a/test/stl_reader_test.cc
+++ b/test/stl_reader_test.cc
@@ -42,8 +42,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
 	BOOST_CHECK_EQUAL (i->italic, false);
 	BOOST_CHECK_EQUAL (i->underline, false);
 	BOOST_CHECK_EQUAL (i->line, 0);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 0, 41, 9));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 0, 42, 21));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 0, 41, 9));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 0, 42, 21));
 	++i;
 
 	BOOST_CHECK (i != subs.end ());
@@ -54,8 +54,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
 	BOOST_CHECK_EQUAL (i->italic, false);
 	BOOST_CHECK_EQUAL (i->underline, false);
 	BOOST_CHECK_EQUAL (i->line, 1);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 0, 41, 9));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 0, 42, 21));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 0, 41, 9));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 0, 42, 21));
 	++i;
 
 	BOOST_CHECK (i != subs.end ());
@@ -66,8 +66,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
 	BOOST_CHECK_EQUAL (i->italic, false);
 	BOOST_CHECK_EQUAL (i->underline, false);
 	BOOST_CHECK_EQUAL (i->line, 0);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
 	++i;
 
 	BOOST_CHECK (i != subs.end ());
@@ -77,16 +77,16 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
 	BOOST_CHECK_EQUAL (i->bold, true);
 	BOOST_CHECK_EQUAL (i->italic, false);
 	BOOST_CHECK_EQUAL (i->underline, false);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
 	++i;
 
 	BOOST_CHECK (i != subs.end ());
 	BOOST_CHECK_EQUAL (i->text, " and some ");
 	BOOST_CHECK_EQUAL (i->font, "Arial");
 	BOOST_CHECK_EQUAL (i->font_size, 42);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
 	BOOST_CHECK_EQUAL (i->bold, false);
 	BOOST_CHECK_EQUAL (i->italic, false);
 	BOOST_CHECK_EQUAL (i->underline, false);
@@ -101,8 +101,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
 	BOOST_CHECK_EQUAL (i->italic, true);
 	BOOST_CHECK_EQUAL (i->underline, false);
 	BOOST_CHECK_EQUAL (i->line, 0);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
 	++i;
 
 	BOOST_CHECK (i != subs.end ());
@@ -112,8 +112,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
 	BOOST_CHECK_EQUAL (i->bold, false);
 	BOOST_CHECK_EQUAL (i->italic, false);
 	BOOST_CHECK_EQUAL (i->underline, false);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
 	++i;
 
 	BOOST_CHECK (i != subs.end ());
@@ -124,8 +124,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
 	BOOST_CHECK_EQUAL (i->italic, false);
 	BOOST_CHECK_EQUAL (i->underline, true);
 	BOOST_CHECK_EQUAL (i->line, 0);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
 	++i;
 
 	BOOST_CHECK_EQUAL (i->text, ".");
@@ -135,8 +135,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
 	BOOST_CHECK_EQUAL (i->italic, false);
 	BOOST_CHECK_EQUAL (i->underline, false);
 	BOOST_CHECK_EQUAL (i->line, 0);
-	BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
-	BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+	BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+	BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
 	++i;
 	
 	BOOST_CHECK (i == subs.end ());
diff --git a/test/stl_writer_test.cc b/test/stl_writer_test.cc
index 91b03b4..5d12169 100644
--- a/test/stl_writer_test.cc
+++ b/test/stl_writer_test.cc
@@ -31,15 +31,33 @@ using std::ofstream;
 BOOST_AUTO_TEST_CASE (stl_writer_test)
 {
 	list<sub::Subtitle> subs;
-	subs.push_back (sub::Subtitle (" This is a subtitle ", "Arial", 42, false, false, false, 0, sub::Time (0, 0, 41, 9), sub::Time (0, 0, 42, 21)));
-	subs.push_back (sub::Subtitle (" and that's a line break", "Arial", 42, false, false, false, 1, sub::Time (0, 0, 41, 9), sub::Time (0, 0, 42, 21)));
-	subs.push_back (sub::Subtitle (" This is some ", "Arial", 42, false, false, false, 0, sub::Time (0, 1, 1, 1), sub::Time (0, 1, 2, 10)));
-	subs.push_back (sub::Subtitle ("bold", "Arial", 42, true, false, false, 0, sub::Time (0, 1, 1, 1), sub::Time (0, 1, 2, 10)));
-	subs.push_back (sub::Subtitle (" and some ", "Arial", 42, false, false, false, 0, sub::Time (0, 1, 1, 1), sub::Time (0, 1, 2, 10)));
-	subs.push_back (sub::Subtitle ("bold italic", "Arial", 42, true, true, false, 0, sub::Time (0, 1, 1, 1), sub::Time (0, 1, 2, 10)));
-	subs.push_back (sub::Subtitle (" and some ", "Arial", 42, false, false, false, 0, sub::Time (0, 1, 1, 1), sub::Time (0, 1, 2, 10)));
-	subs.push_back (sub::Subtitle ("underlined", "Arial", 42, false, false, true, 0, sub::Time (0, 1, 1, 1), sub::Time (0, 1, 2, 10)));
-	subs.push_back (sub::Subtitle (".", "Arial", 42, false, false, false, 0, sub::Time (0, 1, 1, 1), sub::Time (0, 1, 2, 10)));
+	subs.push_back (
+		sub::Subtitle (" This is a subtitle ",     "Arial", 42, false, false, false, 0, sub::FrameTime (0, 0, 41, 9), sub::FrameTime (0, 0, 42, 21))
+		);
+	subs.push_back (
+		sub::Subtitle (" and that's a line break", "Arial", 42, false, false, false, 1, sub::FrameTime (0, 0, 41, 9), sub::FrameTime (0, 0, 42, 21))
+		);
+	subs.push_back (
+		sub::Subtitle (" This is some ",           "Arial", 42, false, false, false, 0, sub::FrameTime (0, 1,  1, 1), sub::FrameTime (0, 1,  2, 10))
+		);
+	subs.push_back (
+		sub::Subtitle ("bold",                     "Arial", 42, true,  false, false, 0, sub::FrameTime (0, 1,  1, 1), sub::FrameTime (0, 1,  2, 10))
+		);
+	subs.push_back (
+		sub::Subtitle (" and some ",               "Arial", 42, false, false, false, 0, sub::FrameTime (0, 1,  1, 1), sub::FrameTime (0, 1,  2, 10))
+		);
+	subs.push_back (
+		sub::Subtitle ("bold italic",              "Arial", 42, true,  true,  false, 0, sub::FrameTime (0, 1,  1, 1), sub::FrameTime (0, 1,  2, 10))
+		);
+	subs.push_back (
+		sub::Subtitle (" and some ",               "Arial", 42, false, false, false, 0, sub::FrameTime (0, 1,  1, 1), sub::FrameTime (0, 1,  2, 10))
+		);
+	subs.push_back (
+		sub::Subtitle ("underlined",               "Arial", 42, false, false, true,  0, sub::FrameTime (0, 1,  1, 1), sub::FrameTime (0, 1,  2, 10))
+		);
+	subs.push_back (
+		sub::Subtitle (".",                        "Arial", 42, false, false, false, 0, sub::FrameTime (0, 1,  1, 1), sub::FrameTime (0, 1,  2, 10))
+		);
 
 	ofstream f ("build/test/test.stl");
 	sub::STLWriter writer (subs, f);