X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.h;h=5bf6363ad282630005a81067e0ac1940179e5cd9;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=b6e9aa63cb1d6c16b5b455d642470b934b88d989;hpb=878e19aabf2278828a3c9b518e0804b2cef0c01e;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index b6e9aa63c..5bf6363ad 100644
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -18,7 +18,7 @@
 
 */
 
-#include "subtitle_decoder.h"
+#include "text_decoder.h"
 #include "dcp_subtitle.h"
 
 class DCPSubtitleContent;
@@ -26,17 +26,14 @@ class DCPSubtitleContent;
 class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
 {
 public:
-	DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>, boost::shared_ptr<Log> log);
+	DCPSubtitleDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const DCPSubtitleContent>);
 
-protected:
-	bool pass (PassReason, bool accurate);
-	void seek (ContentTime time, bool accurate);
+	bool pass ();
+	void seek (dcpomatic::ContentTime time, bool accurate);
 
 private:
-	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-	ContentTimePeriod content_time_period (dcp::SubtitleString s) const;
+	dcpomatic::ContentTimePeriod content_time_period (boost::shared_ptr<dcp::Subtitle> s) const;
 
-	std::list<dcp::SubtitleString> _subtitles;
-	std::list<dcp::SubtitleString>::const_iterator _next;
+	std::list<boost::shared_ptr<dcp::Subtitle> > _subtitles;
+	std::list<boost::shared_ptr<dcp::Subtitle> >::const_iterator _next;
 };