Rearrange subtitle font management.

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

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 95e783d0612a9876ec5f40050240bbd1e3bb03af..4f5964c6fb0019e70b46abaca8b46705ebf642db 100644 (file)
--- 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,14 @@ 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;
 
        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;
 };