X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.h;h=4f5964c6fb0019e70b46abaca8b46705ebf642db;hp=95e783d0612a9876ec5f40050240bbd1e3bb03af;hb=5a820bb8fae34591be5ac6d19a73461b9dab532a;hpb=39fb8198febde1937019db1c300ec363aab5aa56 diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h index 95e783d06..4f5964c6f 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,14 @@ class DCPSubtitleDecoder : public DCPSubtitle, public Decoder public: DCPSubtitleDecoder (std::shared_ptr film, std::shared_ptr); - bool pass (); - void seek (dcpomatic::ContentTime time, bool accurate); + bool pass () override; + void seek (dcpomatic::ContentTime time, bool accurate) override; - std::vector fonts () const; + boost::optional first () const; private: dcpomatic::ContentTimePeriod content_time_period (std::shared_ptr s) const; std::vector> _subtitles; std::vector>::const_iterator _next; - - std::vector _fonts; };