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.h | |
| parent | d0bca7d33b8101cd87f78d5a76b2512dea3988f8 (diff) | |
| parent | 4e5d5c7dcc6470b8dc918d03a00e30c07df60efe (diff) | |
Merge 1.0-seek and subtitle-content.
Diffstat (limited to 'src/lib/subrip.h')
| -rw-r--r-- | src/lib/subrip.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/subrip.h b/src/lib/subrip.h index 91bc7156b..e7d21675f 100644 --- a/src/lib/subrip.h +++ b/src/lib/subrip.h @@ -33,7 +33,7 @@ class SubRip public: SubRip (boost::shared_ptr<const SubRipContent>); - Time length () const; + ContentTime length () const; protected: std::vector<SubRipSubtitle> _subtitles; @@ -44,7 +44,7 @@ private: friend class subrip_content_test; friend class subrip_parse_test; - static Time convert_time (std::string); + static ContentTime convert_time (std::string); static int convert_coordinate (std::string); static std::list<SubRipSubtitlePiece> convert_content (std::list<std::string>); static void maybe_content (std::list<SubRipSubtitlePiece> &, SubRipSubtitlePiece &); |