Use plain git hash for VERSION when there is no exact tag.

[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 31b8e6a8e557656e040ab4746a22855074b54869..9d085125382e82f55d237e52414585f3e3930cf4 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,27 +18,34 @@
 
 */
 
-#include "text_decoder.h"
+
 #include "dcp_subtitle.h"
-#include "font_data.h"
+#include "font_id_allocator.h"
+#include "text_decoder.h"
+
 
 class DCPSubtitleContent;
 
+
 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<dcp::Subtitle> s) const;
+       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::list<std::shared_ptr<dcp::Subtitle> > _subtitles;
-       std::list<std::shared_ptr<dcp::Subtitle> >::const_iterator _next;
+       dcp::SubtitleStandard _subtitle_standard;
 
-       std::vector<dcpomatic::FontData> _fonts;
+       std::shared_ptr<dcp::SubtitleAsset> _asset;
+       FontIDAllocator _font_id_allocator;
 };