X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.h;h=3eed4ad24cd5863dddd9197972c3773693c7b7dd;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hp=95e783d0612a9876ec5f40050240bbd1e3bb03af;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 95e783d06..3eed4ad24 100644
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -21,7 +21,6 @@
 
 #include "text_decoder.h"
 #include "dcp_subtitle.h"
-#include "font_data.h"
 
 
 class DCPSubtitleContent;
@@ -32,16 +31,17 @@ class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
 public:
 	DCPSubtitleDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const DCPSubtitleContent>);
 
-	bool pass ();
-	void seek (dcpomatic::ContentTime time, bool accurate);
+	bool pass () override;
+	void seek (dcpomatic::ContentTime time, bool accurate) override;
 
-	std::vector<dcpomatic::FontData> fonts () const;
+	boost::optional<dcpomatic::ContentTime> first () const;
 
 private:
 	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::vector<dcpomatic::FontData> _fonts;
+	dcp::Standard _standard;
 };