From 19f51503621a57794bd79bac053c9e6549a69f46 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 22 Sep 2019 23:59:49 +0200
Subject: Fix failure to playback encrypted DCPs, introduced when adding
 DCPDecoder re-use optimisation.

---
 src/lib/dcp_decoder.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/lib/dcp_decoder.cc')

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 90b730f5b..95cad9266 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -44,6 +44,7 @@
 #include <dcp/sound_frame.h>
 #include <dcp/sound_asset_reader.h>
 #include <dcp/subtitle_image.h>
+#include <dcp/decrypted_kdm.h>
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -76,6 +77,14 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
 
 	if (old) {
 		_reels = old->_reels;
+
+		/* We might have gained a KDM since we made the Reel objects */
+		if (_dcp_content->kdm ()) {
+			dcp::DecryptedKDM k = decrypted_kdm ();
+			BOOST_FOREACH (shared_ptr<dcp::Reel> i, _reels) {
+				i->add (k);
+			}
+		}
 	} else {
 
 		list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
-- 
cgit v1.2.3