Modify previous commit to move restriction code into the UI.

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

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index 0f4fe5d294c557be548d8baef082b03fb728070a..217c03ecd585c9890d4d6dbf6b1468b1105f345b 100644 (file)
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -17,29 +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>);
-
-       Time length () const;
+       SubRip (boost::shared_ptr<const 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 &);
+       ContentTime length () const;
 
-       std::list<SubRipSubtitle> _subtitles;
+protected:
+       std::vector<sub::Subtitle> _subtitles;
 };
+
+#endif