diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-04 21:16:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-07 22:48:29 +0100 |
| commit | dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch) | |
| tree | e56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/lib/dcp_decoder.h | |
| parent | 0d35820cf50d2789752b8776683b26d04642518d (diff) | |
std::shared_ptr
Diffstat (limited to 'src/lib/dcp_decoder.h')
| -rw-r--r-- | src/lib/dcp_decoder.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 99bdb8bd4..553f05aed 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -42,14 +42,14 @@ class DCPDecoder : public DCP, public Decoder { public: DCPDecoder ( - boost::shared_ptr<const Film> film, - boost::shared_ptr<const DCPContent>, + std::shared_ptr<const Film> film, + std::shared_ptr<const DCPContent>, bool fast, bool tolerant, - boost::shared_ptr<DCPDecoder> old + 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; } @@ -75,28 +75,28 @@ private: void pass_texts (dcpomatic::ContentTime next, dcp::Size size); void pass_texts ( dcpomatic::ContentTime next, - boost::shared_ptr<dcp::SubtitleAsset> asset, + std::shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, - boost::shared_ptr<TextDecoder> decoder, + std::shared_ptr<TextDecoder> decoder, dcp::Size size ); - std::string calculate_lazy_digest (boost::shared_ptr<const DCPContent>) const; + 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 */ dcpomatic::ContentTime _next; - std::list<boost::shared_ptr<dcp::Reel> > _reels; + 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; - boost::shared_ptr<dcp::AtmosAssetReader> _atmos_reader; + std::shared_ptr<dcp::SoundAssetReader> _sound_reader; + std::shared_ptr<dcp::AtmosAssetReader> _atmos_reader; boost::optional<AtmosMetadata> _atmos_metadata; bool _decode_referenced; |
