Handle vertical alignment of subs correctly wrt the difference between Interop and...

[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 4a54aaf2ef09529ead0f04f29b57eda8423a6778..3eed4ad24cd5863dddd9197972c3773693c7b7dd 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;
@@ -35,13 +34,14 @@ public:
        bool pass () override;
        void seek (dcpomatic::ContentTime time, bool accurate) override;
 
-       std::vector<dcpomatic::FontData> fonts () const override;
+       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;
 };