X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip.h;h=e7d21675f41e140e11777d750e64087855d4c680;hb=a5139de256c287459e04c75712614b2e7246a89a;hp=0f4fe5d294c557be548d8baef082b03fb728070a;hpb=c943bc82e8d585d85ca1b4832e258436fa7615ce;p=dcpomatic.git

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index 0f4fe5d29..e7d21675f 100644
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -17,29 +17,37 @@
 
 */
 
+#ifndef DCPOMATIC_SUBRIP_H
+#define DCPOMATIC_SUBRIP_H
+
 #include "subrip_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>);
+	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 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::list<SubRipSubtitle> _subtitles;
 };
+
+#endif