Cleanup: use a namespace.

[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 d1237b2761c337a9b629b3baad7383e6b3e4ce19..45a4999ddcf769781bd87c8a577264b6511a6e06 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,15 +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::SubtitleStandard _subtitle_standard;
 };