diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-14 17:39:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-20 11:20:25 +0000 |
| commit | 3f630fb8334238ab8a58fbe1a0f513ae2c00de80 (patch) | |
| tree | 4b773b91029d6374bfd4f2194053d3e249d597cd /src/subrip_reader.cc | |
| parent | 49cafda01b3e07c47e3b20dd5ee91e1426446aea (diff) | |
Simplify time representation; better in-tree DCP subtitle parser.
Diffstat (limited to 'src/subrip_reader.cc')
| -rw-r--r-- | src/subrip_reader.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/subrip_reader.cc b/src/subrip_reader.cc index 0aba120..5e9e010 100644 --- a/src/subrip_reader.cc +++ b/src/subrip_reader.cc @@ -39,8 +39,8 @@ SubripReader::SubripReader (FILE* f) char buffer[256]; - TimePair from; - TimePair to; + Time from; + Time to; string line; int line_number = 0; @@ -94,7 +94,7 @@ SubripReader::SubripReader (FILE* f) } } -TimePair +Time SubripReader::convert_time (string t) { vector<string> a; @@ -106,18 +106,16 @@ SubripReader::convert_time (string t) vector<string> b; boost::algorithm::split (b, a[2], boost::is_any_of (",")); - return TimePair ( - MetricTime ( - lexical_cast<int> (a[0]), - lexical_cast<int> (a[1]), - lexical_cast<int> (b[0]), - lexical_cast<int> (b[1]) - ) + return Time::from_hms ( + lexical_cast<int> (a[0]), + lexical_cast<int> (a[1]), + lexical_cast<int> (b[0]), + lexical_cast<int> (b[1]) ); } void -SubripReader::convert_line (string t, int line_number, TimePair from, TimePair to) +SubripReader::convert_line (string t, int line_number, Time from, Time to) { enum { TEXT, |