Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index e7d21675f41e140e11777d750e64087855d4c680..35687eb00ce0636d36bb630d3f533455fb9208de 100644 (file)
--- 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 class subrip_time_test;
-       friend class subrip_coordinate_test;
-       friend class subrip_content_test;
-       friend class 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