X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=1abe39a27d7e56bf74bb8a58be4ec557f7b7d301;hb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247;hp=496d95740d63cf26e9c74024dd43f506416cbf7b;hpb=96f7dd41a2c8627bc1ea0d24d84142eb04b4ffef;p=dcpomatic.git diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 496d95740..1abe39a27 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington + Copyright (C) 2014-2020 Carl Hetherington 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 @@ -62,6 +63,8 @@ public: return _lazy_digest; } + dcpomatic::ContentTime position () const; + private: friend struct dcp_subtitle_within_dcp_test; @@ -91,6 +94,8 @@ private: boost::shared_ptr _stereo_reader; /** Reader for current sound asset, if applicable */ boost::shared_ptr _sound_reader; + boost::shared_ptr _atmos_reader; + boost::optional _atmos_metadata; bool _decode_referenced; boost::optional _forced_reduction;