diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-29 09:14:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-29 20:53:49 +0200 |
| commit | 39fb8198febde1937019db1c300ec363aab5aa56 (patch) | |
| tree | 52bc32134e8ae2b5587b3a62130baa9acf815b60 /src/lib/dcp_decoder.h | |
| parent | b249700e1da7dd6631a8b4440587f4093a2bdef1 (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/dcp_decoder.h')
| -rw-r--r-- | src/lib/dcp_decoder.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 887f8ad5c..a4dfbad4e 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,10 +18,12 @@ */ + /** @file src/dcp_decoder.h * @brief A decoder of existing DCPs. */ + #include "atmos_metadata.h" #include "decoder.h" #include "dcp.h" @@ -30,6 +32,7 @@ #include <dcp/sound_asset_reader.h> #include <dcp/subtitle_asset.h> + namespace dcp { class Reel; } @@ -38,6 +41,7 @@ class DCPContent; class Log; struct dcp_subtitle_within_dcp_test; + class DCPDecoder : public DCP, public Decoder { public: @@ -56,16 +60,16 @@ public: void set_decode_referenced (bool r); void set_forced_reduction (boost::optional<int> reduction); - bool pass (); - void seek (dcpomatic::ContentTime t, bool accurate); + bool pass () override; + void seek (dcpomatic::ContentTime t, bool accurate) override; - std::vector<dcpomatic::FontData> fonts () const; + std::vector<dcpomatic::FontData> fonts () const override; std::string lazy_digest () const { return _lazy_digest; } - dcpomatic::ContentTime position () const; + dcpomatic::ContentTime position () const override; private: friend struct dcp_subtitle_within_dcp_test; @@ -89,7 +93,7 @@ private: std::vector<std::shared_ptr<dcp::Reel>>::iterator _reel; /** Offset of _reel from the start of the content in frames */ - int64_t _offset; + int64_t _offset = 0; /** Reader for current mono picture asset, if applicable */ std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader; /** Reader for current stereo picture asset, if applicable */ @@ -99,7 +103,7 @@ private: std::shared_ptr<dcp::AtmosAssetReader> _atmos_reader; boost::optional<AtmosMetadata> _atmos_metadata; - bool _decode_referenced; + bool _decode_referenced = false; boost::optional<int> _forced_reduction; std::string _lazy_digest; |