From 3f630fb8334238ab8a58fbe1a0f513ae2c00de80 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 14 Jan 2015 17:39:32 +0000
Subject: Simplify time representation; better in-tree DCP subtitle parser.

---
 src/stl_text_reader.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/stl_text_reader.cc')

diff --git a/src/stl_text_reader.cc b/src/stl_text_reader.cc
index b86a656..ad155c9 100644
--- a/src/stl_text_reader.cc
+++ b/src/stl_text_reader.cc
@@ -88,16 +88,16 @@ STLTextReader::STLTextReader (istream& in)
 			string to_string = line.substr (divider[0] + 1, divider[1] - divider[0] - 1);
 			trim (to_string);
 
-			optional<FrameTime> from = time (from_string);
-			optional<FrameTime> to = time (to_string);
+			optional<Time> from = time (from_string);
+			optional<Time> to = time (to_string);
 
 			if (!from || !to) {
 				warn (String::compose ("Unrecognised line %1", line));
 				continue;
 			}
 
-			_subtitle.from.set_frame (from.get ());
-			_subtitle.to.set_frame (to.get ());
+			_subtitle.from = from.get ();
+			_subtitle.to = to.get ();
 
 			/* Parse ^B/^I/^U */
 			string text = line.substr (divider[1] + 1);
@@ -131,17 +131,17 @@ STLTextReader::STLTextReader (istream& in)
 	}
 }
 
-optional<FrameTime>
+optional<Time>
 STLTextReader::time (string t) const
 {
 	vector<string> b;
 	split (b, t, is_any_of (":"));
 	if (b.size() != 4) {
 		warn (String::compose ("Unrecognised time %1", t));
-		return optional<FrameTime> ();
+		return optional<Time> ();
 	}
 
-	return FrameTime (lexical_cast<int> (b[0]), lexical_cast<int> (b[1]), lexical_cast<int> (b[2]), lexical_cast<int> (b[3]));
+	return sub::Time::from_hmsf (lexical_cast<int> (b[0]), lexical_cast<int> (b[1]), lexical_cast<int> (b[2]), lexical_cast<int> (b[3]));
 }
 
 void
-- 
cgit v1.2.3