X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip.h;h=35687eb00ce0636d36bb630d3f533455fb9208de;hb=db3cd90dadf60df72ebbd95c59b32954f29b9c38;hp=7603a101de4a07a69588da726e924a5f1ad1529e;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;p=dcpomatic.git

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index 7603a101d..35687eb00 100644
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -20,7 +20,10 @@
 #ifndef DCPOMATIC_SUBRIP_H
 #define DCPOMATIC_SUBRIP_H
 
-#include "subrip_subtitle.h"
+#include "dcpomatic_time.h"
+#include <sub/subtitle.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 class SubRipContent;
 class subrip_time_test;
@@ -36,18 +39,7 @@ public:
 	ContentTime length () const;
 
 protected:
-	std::vector<SubRipSubtitle> _subtitles;
-	
-private:
-	friend struct subrip_time_test;
-	friend struct subrip_coordinate_test;
-	friend struct subrip_content_test;
-	friend struct subrip_parse_test;
-	
-	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 &);
+	std::vector<sub::Subtitle> _subtitles;
 };
 
 #endif