Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 71687ad15df1e3eabe711466f7d27cc21f78e776..36b5bbafb049727d806a943053d0c4585aceaad9 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,13 +40,14 @@ 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 DCPContent>, boost::shared_ptr<Log> log, 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);
@@ -55,6 +57,8 @@ private:
 
        void next_reel ();
        void get_readers ();
+       void pass_texts (ContentTime next);
+       void pass_texts (ContentTime next, boost::shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, boost::shared_ptr<TextDecoder> decoder);
 
        /** Time of next thing to return from pass relative to the start of _reel */
        ContentTime _next;
@@ -71,4 +75,5 @@ private:
        boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
 
        bool _decode_referenced;
+       boost::optional<int> _forced_reduction;
 };