X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.h;h=b53b88dedab7806eaa12b6c8ba6dc6d20641dabe;hb=599d160c51d8f0182b02d9e73137492d6f19dc11;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..b53b88ded 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,25 +18,27 @@
 
 */
 
-#include "subtitle_decoder.h"
+#include "text_decoder.h"
 #include "dcp_subtitle.h"
+#include "font_data.h"
 
 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);
+
+	std::vector<dcpomatic::FontData> fonts () 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 (boost::shared_ptr<dcp::Subtitle> s) const;
+
+	std::list<boost::shared_ptr<dcp::Subtitle> > _subtitles;
+	std::list<boost::shared_ptr<dcp::Subtitle> >::const_iterator _next;
 
-	std::list<dcp::SubtitleString> _subtitles;
-	std::list<dcp::SubtitleString>::const_iterator _next;
+	std::vector<dcpomatic::FontData> _fonts;
 };