X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip.h;h=217c03ecd585c9890d4d6dbf6b1468b1105f345b;hb=f213fd833a840fc97e3875979ae7dc7cbbc883b1;hp=91bc7156b65b0a6b6c26e1288b32d5198872fb0e;hpb=86214f4619476b1a4951e15f002a93743b5f7a1e;p=dcpomatic.git

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index 91bc7156b..217c03ecd 100644
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -21,6 +21,7 @@
 #define DCPOMATIC_SUBRIP_H
 
 #include "subrip_subtitle.h"
+#include <sub/subtitle.h>
 
 class SubRipContent;
 class subrip_time_test;
@@ -33,21 +34,10 @@ 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;
-	
-	static Time 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 &);
+	std::vector<sub::Subtitle> _subtitles;
 };
 
 #endif