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 /src/subrip_reader.cc | |
| parent | acca8cb950de132fbc4be40e7dc7d294c6cb0a38 (diff) | |
Re-work time.
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..20b234d 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_hmsm ( + 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, |