Take Film pointer out of Content.

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 6ec9de684d74da53abb204b578e91ee1f314c2c5..d3c5c57eddc368ba65f68c77b37713bf1f52fffb 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -27,6 +27,7 @@
 #include <dcp/mono_picture_asset_reader.h>
 #include <dcp/stereo_picture_asset_reader.h>
 #include <dcp/sound_asset_reader.h>
+#include <dcp/subtitle_asset.h>
 
 namespace dcp {
        class Reel;
@@ -39,23 +40,33 @@ struct dcp_subtitle_within_dcp_test;
 class DCPDecoder : public DCP, public Decoder
 {
 public:
-       DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, bool fast);
+       DCPDecoder (boost::shared_ptr<const DCPContent>, bool fast);
 
        std::list<boost::shared_ptr<dcp::Reel> > reels () const {
                return _reels;
        }
 
-       void set_decode_referenced ();
+       void set_decode_referenced (bool r);
        void set_forced_reduction (boost::optional<int> reduction);
 
-       bool pass ();
-       void seek (ContentTime t, bool accurate);
+       bool pass (boost::shared_ptr<const Film> film);
+       void seek (boost::shared_ptr<const Film> film, ContentTime t, bool accurate);
 
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
        void next_reel ();
        void get_readers ();
+       void pass_texts (boost::shared_ptr<const Film> film, ContentTime next, dcp::Size size);
+       void pass_texts (
+               boost::shared_ptr<const Film> film,
+               ContentTime next,
+               boost::shared_ptr<dcp::SubtitleAsset> asset,
+               bool reference,
+               int64_t entry_point,
+               boost::shared_ptr<TextDecoder> decoder,
+               dcp::Size size
+               );
 
        /** Time of next thing to return from pass relative to the start of _reel */
        ContentTime _next;