Give DCPDecoder its own ::position which just returns its internal

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 6e1f95356a06f674a4562f3a385fd4d67f89b1f3..4de8c86299a0af3fc096387f6f3ea3bab3a77033 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -24,12 +24,13 @@
 
 #include "decoder.h"
 #include "dcp.h"
+#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;
-       class MonoPictureAssetReader;
-       class StereoPictureAssetReader;
-       class SoundAssetReader;
 }
 
 class DCPContent;
@@ -39,27 +40,48 @@ struct dcp_subtitle_within_dcp_test;
 class DCPDecoder : public DCP, public Decoder
 {
 public:
-       DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log);
+       DCPDecoder (
+               boost::shared_ptr<const Film> film,
+               boost::shared_ptr<const DCPContent>,
+               bool fast,
+               bool tolerant,
+               boost::shared_ptr<DCPDecoder> old
+               );
 
        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 (dcpomatic::ContentTime t, bool accurate);
+
+       std::string lazy_digest () const {
+               return _lazy_digest;
+       }
+
+       dcpomatic::ContentTime position () const;
 
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
-       bool pass (PassReason, bool accurate);
-       void seek (ContentTime t, bool accurate);
        void next_reel ();
        void get_readers ();
-
-       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+       void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
+       void pass_texts (
+               dcpomatic::ContentTime next,
+               boost::shared_ptr<dcp::SubtitleAsset> asset,
+               bool reference,
+               int64_t entry_point,
+               boost::shared_ptr<TextDecoder> decoder,
+               dcp::Size size
+               );
+       std::string calculate_lazy_digest (boost::shared_ptr<const DCPContent>) const;
 
        /** Time of next thing to return from pass relative to the start of _reel */
-       ContentTime _next;
+       dcpomatic::ContentTime _next;
        std::list<boost::shared_ptr<dcp::Reel> > _reels;
 
        std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
@@ -73,4 +95,7 @@ private:
        boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
 
        bool _decode_referenced;
+       boost::optional<int> _forced_reduction;
+
+       std::string _lazy_digest;
 };