Fix subtitle timing under trim.

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

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index 6451c105fe6961302b4a39ecc9c4e048edf445cb..35687eb00ce0636d36bb630d3f533455fb9208de 100644 (file)
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -17,7 +17,13 @@
 
 */
 
-#include "subrip_subtitle.h"
+#ifndef DCPOMATIC_SUBRIP_H
+#define DCPOMATIC_SUBRIP_H
+
+#include "dcpomatic_time.h"
+#include <sub/subtitle.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 class SubRipContent;
 class subrip_time_test;
@@ -28,20 +34,12 @@ class subrip_parse_test;
 class SubRip
 {
 public:
-       SubRip (boost::shared_ptr<SubRipContent>);
-
-       Time length () const;
-
-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::list<SubRipSubtitle> _subtitles;
+       SubRip (boost::shared_ptr<const SubRipContent>);
+
+       ContentTime length () const;
+
+protected:
+       std::vector<sub::Subtitle> _subtitles;
 };
+
+#endif