Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 61fd91abaf6cb605eee10807be444f2e720649bc..12e37104e599b76f7e272d212bef9fdfb1683b7d 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -26,6 +26,9 @@
 
 namespace dcp {
        class Reel;
+       class MonoPictureAssetReader;
+       class StereoPictureAssetReader;
+       class SoundAssetReader;
 }
 
 class DCPContent;
@@ -35,24 +38,39 @@ struct dcp_subtitle_within_dcp_test;
 class DCPDecoder : public Decoder
 {
 public:
-       DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, bool fast);
+       DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log);
 
        std::list<boost::shared_ptr<dcp::Reel> > reels () const {
                return _reels;
        }
 
+       void set_decode_referenced ();
+
 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;
 
+       boost::shared_ptr<const DCPContent> _dcp_content;
        /** Time of next thing to return from pass relative to the start of _reel */
        ContentTime _next;
        std::list<boost::shared_ptr<dcp::Reel> > _reels;
+
        std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
-       boost::shared_ptr<const DCPContent> _dcp_content;
+       /** Offset of _reel from the start of the content in frames */
+       int64_t _offset;
+       /** Reader for current mono picture asset, if applicable */
+       boost::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+       /** Reader for current stereo picture asset, if applicable */
+       boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+       /** Reader for current sound asset, if applicable */
+       boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+
+       bool _decode_referenced;
 };