From aab6630b945371038cc49e456a766ae45cab1f47 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 8 Oct 2021 12:08:10 +0200
Subject: Fix problems when adding KDMs to a VF, before adding the OV.

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.
---
 src/reel.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/reel.h')

diff --git a/src/reel.h b/src/reel.h
index d3ea7f0c..9a3c38d3 100644
--- a/src/reel.h
+++ b/src/reel.h
@@ -41,11 +41,12 @@
 #define LIBDCP_REEL_H
 
 
+#include "decrypted_kdm.h"
 #include "key.h"
-#include "types.h"
 #include "ref.h"
-#include <memory>
+#include "types.h"
 #include <boost/function.hpp>
+#include <memory>
 
 
 namespace cxml {
@@ -136,12 +137,16 @@ public:
 	void resolve_refs (std::vector<std::shared_ptr<Asset>>);
 
 private:
+	void give_kdm_to_assets (dcp::DecryptedKDM const& kdm);
+
 	std::shared_ptr<ReelPictureAsset> _main_picture;
 	std::shared_ptr<ReelSoundAsset> _main_sound;
 	std::shared_ptr<ReelSubtitleAsset> _main_subtitle;
 	std::shared_ptr<ReelMarkersAsset> _main_markers;
 	std::vector<std::shared_ptr<ReelClosedCaptionAsset>> _closed_captions;
 	std::shared_ptr<ReelAtmosAsset> _atmos;
+
+	std::vector<dcp::DecryptedKDM> _kdms;
 };
 
 }
-- 
cgit v1.2.3