From dcccb2dd1d180b8be67e539395dccbe82b0fb5a8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 6 Jul 2013 20:30:19 +0100
Subject: Move some CPL writing from picture/sound assets to the MXF.  Pick up
 key_id from CPL assets and hence provide and test for encrypted() method on
 DCP.

---
 src/parse/cpl.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/parse/cpl.cc')

diff --git a/src/parse/cpl.cc b/src/parse/cpl.cc
index c4cf4374..e7ed4497 100644
--- a/src/parse/cpl.cc
+++ b/src/parse/cpl.cc
@@ -111,6 +111,8 @@ Picture::Picture (shared_ptr<const cxml::Node> node)
 
 	}
 
+	key_id = node->optional_string_child ("KeyId").get_value_or ("");
+
 	node->ignore_child ("Hash");
 
 	node->done ();
@@ -124,7 +126,8 @@ MainSound::MainSound (shared_ptr<const cxml::Node> node)
 	intrinsic_duration = node->number_child<int64_t> ("IntrinsicDuration");
 	entry_point = node->number_child<int64_t> ("EntryPoint");
 	duration = node->number_child<int64_t> ("Duration");
-
+	key_id = node->optional_string_child ("KeyId").get_value_or ("");
+	
 	node->ignore_child ("Hash");
 	node->ignore_child ("Language");
 	
-- 
cgit v1.2.3