diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-15 21:23:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-15 21:23:33 +0000 |
| commit | 8353a009aae1a604251c0160193c39741c2fa27c (patch) | |
| tree | 558d2b1951f2b4f05f0ab93b46d10afd0ebee929 /src/lib/subrip.cc | |
| parent | d0bca7d33b8101cd87f78d5a76b2512dea3988f8 (diff) | |
| parent | 4e5d5c7dcc6470b8dc918d03a00e30c07df60efe (diff) | |
Merge 1.0-seek and subtitle-content.
Diffstat (limited to 'src/lib/subrip.cc')
| -rw-r--r-- | src/lib/subrip.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/subrip.cc b/src/lib/subrip.cc index be2c6f666..380a2ce2c 100644 --- a/src/lib/subrip.cc +++ b/src/lib/subrip.cc @@ -123,10 +123,10 @@ SubRip::SubRip (shared_ptr<const SubRipContent> content) fclose (f); } -Time +ContentTime SubRip::convert_time (string t) { - Time r = 0; + ContentTime r = 0; vector<string> a; boost::algorithm::split (a, t, boost::is_any_of (":")); @@ -225,7 +225,7 @@ SubRip::convert_content (list<string> t) return pieces; } -Time +ContentTime SubRip::length () const { if (_subtitles.empty ()) { |