X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.h;h=3eed4ad24cd5863dddd9197972c3773693c7b7dd;hb=9726a58f44d52d235b027225ddd68c6acf83c733;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..3eed4ad24 100644
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,25 +18,30 @@
 
 */
 
-#include "subtitle_decoder.h"
+
+#include "text_decoder.h"
 #include "dcp_subtitle.h"
 
+
 class DCPSubtitleContent;
 
+
 class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
 {
 public:
-	DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>, boost::shared_ptr<Log> log);
+	DCPSubtitleDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const DCPSubtitleContent>);
 
-protected:
-	bool pass (PassReason, bool accurate);
-	void seek (ContentTime time, bool accurate);
+	bool pass () override;
+	void seek (dcpomatic::ContentTime time, bool accurate) override;
+
+	boost::optional<dcpomatic::ContentTime> first () const;
 
 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 (std::shared_ptr<const dcp::Subtitle> s) const;
+	void update_position();
+
+	std::vector<std::shared_ptr<const dcp::Subtitle>> _subtitles;
+	std::vector<std::shared_ptr<const dcp::Subtitle>>::const_iterator _next;
 
-	std::list<dcp::SubtitleString> _subtitles;
-	std::list<dcp::SubtitleString>::const_iterator _next;
+	dcp::Standard _standard;
 };