X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip.h;h=217c03ecd585c9890d4d6dbf6b1468b1105f345b;hb=ed1a6b0bf1a2c781a22640fd8a0c44a79f063bae;hp=a8d8104c4f6bbe1b38111d9a4de152591f6eabb6;hpb=7e2cf1a4a04828b5a57d5eb6869475a819005602;p=dcpomatic.git

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index a8d8104c4..217c03ecd 100644
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -17,27 +17,27 @@
 
 */
 
+#ifndef DCPOMATIC_SUBRIP_H
+#define DCPOMATIC_SUBRIP_H
+
 #include "subrip_subtitle.h"
+#include <sub/subtitle.h>
 
 class SubRipContent;
 class subrip_time_test;
 class subrip_coordinate_test;
 class subrip_content_test;
+class subrip_parse_test;
 
 class SubRip
 {
 public:
-	SubRip (boost::shared_ptr<SubRipContent>);
-
-private:
-	friend class subrip_time_test;
-	friend class subrip_coordinate_test;
-	friend class subrip_content_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::list<SubRipSubtitle> _subtitles;
+	SubRip (boost::shared_ptr<const SubRipContent>);
+
+	ContentTime length () const;
+
+protected:
+	std::vector<sub::Subtitle> _subtitles;
 };
+
+#endif