Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / src / lib / subrip.h

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index 91bc7156b65b0a6b6c26e1288b32d5198872fb0e..7603a101de4a07a69588da726e924a5f1ad1529e 100644 (file)
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -33,18 +33,18 @@ class SubRip
 public:
        SubRip (boost::shared_ptr<const SubRipContent>);
 
-       Time length () const;
+       ContentTime length () const;
 
 protected:
        std::vector<SubRipSubtitle> _subtitles;
        
 private:
-       friend class subrip_time_test;
-       friend class subrip_coordinate_test;
-       friend class subrip_content_test;
-       friend class subrip_parse_test;
+       friend struct subrip_time_test;
+       friend struct subrip_coordinate_test;
+       friend struct subrip_content_test;
+       friend struct 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 &);