diff options
Diffstat (limited to 'src/asset_reader.h')
| -rw-r--r-- | src/asset_reader.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/asset_reader.h b/src/asset_reader.h index c8953e09..091ac915 100644 --- a/src/asset_reader.h +++ b/src/asset_reader.h @@ -53,9 +53,9 @@ namespace dcp { class AtmosAsset; -class MonoPictureAsset; +class MonoJ2KPictureAsset; class SoundAsset; -class StereoPictureAsset; +class StereoJ2KPictureAsset; template <class R, class F> @@ -90,14 +90,16 @@ protected: private: friend class AtmosAsset; - friend class MonoPictureAsset; + friend class MonoJ2KPictureAsset; + friend class MonoMPEG2PictureAsset; friend class SoundAsset; - friend class StereoPictureAsset; + friend class StereoJ2KPictureAsset; - explicit AssetReader (Asset const * asset, boost::optional<Key> key, Standard standard) + AssetReader(Asset const * asset, boost::optional<Key> key, Standard standard) : _crypto_context (new DecryptionContext(key, standard)) { - _reader = new R (); + Kumu::FileReaderFactory factory; + _reader = new R(factory); DCP_ASSERT (asset->file()); auto const r = _reader->OpenRead(dcp::filesystem::fix_long_path(*asset->file()).string().c_str()); if (ASDCP_FAILURE(r)) { |