std::shared_ptr

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 8281babc3a0a92c985c1448d706eadaaa5d332fe..553f05aedc433610b4c41f189a728c7cc5f65fdf 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,6 +22,7 @@
  *  @brief A decoder of existing DCPs.
  */
 
+#include "atmos_metadata.h"
 #include "decoder.h"
 #include "dcp.h"
 #include <dcp/mono_picture_asset_reader.h>
@@ -40,9 +41,15 @@ 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 (
+               std::shared_ptr<const Film> film,
+               std::shared_ptr<const DCPContent>,
+               bool fast,
+               bool tolerant,
+               std::shared_ptr<DCPDecoder> old
+               );
 
-       std::list<boost::shared_ptr<dcp::Reel> > reels () const {
+       std::list<std::shared_ptr<dcp::Reel> > reels () const {
                return _reels;
        }
 
@@ -50,32 +57,50 @@ public:
        void set_forced_reduction (boost::optional<int> reduction);
 
        bool pass ();
-       void seek (ContentTime t, bool accurate);
+       void seek (dcpomatic::ContentTime t, bool accurate);
+
+       std::vector<dcpomatic::FontData> fonts () const;
+
+       std::string lazy_digest () const {
+               return _lazy_digest;
+       }
+
+       dcpomatic::ContentTime position () const;
 
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
        void next_reel ();
        void get_readers ();
-       void pass_texts (ContentTime next, dcp::Size size);
+       void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
        void pass_texts (
-               ContentTime next, boost::shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, boost::shared_ptr<TextDecoder> decoder, dcp::Size size
+               dcpomatic::ContentTime next,
+               std::shared_ptr<dcp::SubtitleAsset> asset,
+               bool reference,
+               int64_t entry_point,
+               std::shared_ptr<TextDecoder> decoder,
+               dcp::Size size
                );
+       std::string calculate_lazy_digest (std::shared_ptr<const DCPContent>) const;
 
        /** Time of next thing to return from pass relative to the start of _reel */
-       ContentTime _next;
-       std::list<boost::shared_ptr<dcp::Reel> > _reels;
+       dcpomatic::ContentTime _next;
+       std::list<std::shared_ptr<dcp::Reel> > _reels;
 
-       std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
+       std::list<std::shared_ptr<dcp::Reel> >::iterator _reel;
        /** 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;
+       std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
        /** Reader for current stereo picture asset, if applicable */
-       boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+       std::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
        /** Reader for current sound asset, if applicable */
-       boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+       std::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+       std::shared_ptr<dcp::AtmosAssetReader> _atmos_reader;
+       boost::optional<AtmosMetadata> _atmos_metadata;
 
        bool _decode_referenced;
        boost::optional<int> _forced_reduction;
+
+       std::string _lazy_digest;
 };