diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-10-08 12:08:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-10-08 12:48:43 +0200 |
| commit | aab6630b945371038cc49e456a766ae45cab1f47 (patch) | |
| tree | a82f7ceaff2d091bff154e604b9c3e861b2994af /src/sound_asset.h | |
| parent | 99d2243b7674c0673fee5f6f6cd4a65da16db37c (diff) | |
Fix problems when adding KDMs to a VF, before adding the OV.v1.8.2
If we have a KDM which contains keys for all the assets referred
to by a VF (even the ones in the OV) we would previously throw
an exception because we tried to give the KDM to the resolved
assets when it was given to the Reel.
Here we change things so that the addition of KDMs to assets can
be deferred if the asset is not yet resolved.
Diffstat (limited to 'src/sound_asset.h')
| -rw-r--r-- | src/sound_asset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sound_asset.h b/src/sound_asset.h index 799e671c..c943d88b 100644 --- a/src/sound_asset.h +++ b/src/sound_asset.h @@ -55,7 +55,7 @@ namespace dcp { extern std::shared_ptr<dcp::SoundAsset> simple_sound ( - boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate + boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate, boost::optional<dcp::Key> ); @@ -112,7 +112,7 @@ public: private: friend class SoundAssetWriter; friend std::shared_ptr<dcp::SoundAsset> (::simple_sound) ( - boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate + boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate, boost::optional<dcp::Key> ); std::string pkl_type (Standard standard) const override { |