From e327e82945297e2fc878149fc5b6c507037a9d97 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 23 Dec 2015 00:21:19 +0000 Subject: Remove some unused code; add EncryptedKDM::cpl_id(). --- src/encrypted_kdm.cc | 11 ++++++----- src/encrypted_kdm.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc index 207dff67..22bb86e4 100644 --- a/src/encrypted_kdm.cc +++ b/src/encrypted_kdm.cc @@ -613,11 +613,6 @@ EncryptedKDM::as_xml (boost::filesystem::path path) const string EncryptedKDM::as_xml () const { - xmlpp::Document document; - xmlpp::Element* root = document.create_root_node ("DCinemaSecurityMessage", "http://www.smpte-ra.org/schemas/430-3/2006/ETM"); - root->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "ds"); - root->set_namespace_declaration ("http://www.w3.org/2001/04/xmlenc#", "enc"); - return _data->as_xml()->write_to_string ("UTF-8"); } @@ -639,6 +634,12 @@ EncryptedKDM::content_title_text () const return _data->authenticated_public.required_extensions.kdm_required_extensions.content_title_text; } +string +EncryptedKDM::cpl_id () const +{ + return _data->authenticated_public.required_extensions.kdm_required_extensions.composition_playlist_id; +} + string EncryptedKDM::issue_date () const { diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h index 9e5b09d4..c899dcbe 100644 --- a/src/encrypted_kdm.h +++ b/src/encrypted_kdm.h @@ -74,6 +74,7 @@ public: std::string annotation_text () const; std::string content_title_text () const; std::string issue_date () const; + std::string cpl_id () const; private: -- cgit v1.2.3