diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-20 21:17:54 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-20 21:17:54 +0200 |
| commit | 86eb90b563efb7ef093d5b17a5d6db0fc330e301 (patch) | |
| tree | 61d19ca8d8222b8191bd12e650bf4f831b42c180 /src/lib/dcp_decoder.h | |
| parent | 3855bfd7991b1d7411934fc564dd5714eca6bc1b (diff) | |
Remove DCP class and replace its functionality with a plain method in libdcp.
Diffstat (limited to 'src/lib/dcp_decoder.h')
| -rw-r--r-- | src/lib/dcp_decoder.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index a4dfbad4e..0882bfd09 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -26,7 +26,6 @@ #include "atmos_metadata.h" #include "decoder.h" -#include "dcp.h" #include <dcp/mono_picture_asset_reader.h> #include <dcp/stereo_picture_asset_reader.h> #include <dcp/sound_asset_reader.h> @@ -42,12 +41,12 @@ class Log; struct dcp_subtitle_within_dcp_test; -class DCPDecoder : public DCP, public Decoder +class DCPDecoder : public Decoder { public: DCPDecoder ( std::shared_ptr<const Film> film, - std::shared_ptr<const DCPContent>, + std::shared_ptr<const DCPContent> content, bool fast, bool tolerant, std::shared_ptr<DCPDecoder> old @@ -87,6 +86,8 @@ private: ); std::string calculate_lazy_digest (std::shared_ptr<const DCPContent>) const; + std::shared_ptr<const DCPContent> _dcp_content; + /** Time of next thing to return from pass relative to the start of _reel */ dcpomatic::ContentTime _next; std::vector<std::shared_ptr<dcp::Reel>> _reels; |