Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

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

diff --git a/src/lib/subrip_decoder.h b/src/lib/subrip_decoder.h
index b963bfb35d9704d8f1798d9053832c839b4c064a..ad9d04e4003029f6a9b99b62714b4fbdd0a13a6f 100644 (file)
--- a/src/lib/subrip_decoder.h
+++ b/src/lib/subrip_decoder.h
@@ -28,12 +28,15 @@ class SubRipContent;
 class SubRipDecoder : public SubtitleDecoder, public SubRip
 {
 public:
-       SubRipDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SubRipContent>);
-       
-       void pass ();
-       bool done () const;
+       SubRipDecoder (boost::shared_ptr<const SubRipContent>);
+
+protected:
+       void seek (ContentTime time, bool accurate);
+       bool pass ();
 
 private:
+       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+       
        size_t _next;
 };