Remove some unused code; add EncryptedKDM::cpl_id().

diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc
index 207dff67bc8efb449634f458853b4c101c977e17..22bb86e4f46eadd13176e8610f6785922d522462 100644 (file)
--- 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 9e5b09d4510ba0ea67979d8afbc39c5065cb9f9d..c899dcbe4423e9cd85aa1f001389df8a0c162b6d 100644 (file)
--- 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: