KDM XML fix.

diff --git a/src/kdm.cc b/src/kdm.cc
index 9e49fcabea5d4c52525b8322ebf36b929e9451c3..b9e598b913604c2fe4476b25262abac30a0b1786 100644 (file)
--- a/src/kdm.cc
+++ b/src/kdm.cc
@@ -96,8 +96,9 @@ KDM::KDM (
        xml::AuthenticatedPublic& apu = xml_kdm->authenticated_public;
 
        /* AuthenticatedPublic */
-       
-       apu.message_type = "urn:uuid:" + make_uuid ();
+
+       apu.message_id = "urn:uuid:" + make_uuid ();
+       apu.message_type = "http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type";
        apu.annotation_text = mxf_metadata.product_name;
        apu.issue_date = xml_metadata.issue_date;
        apu.signer.x509_issuer_name = signer->certificates().leaf()->issuer ();

diff --git a/src/xml/kdm_smpte.cc b/src/xml/kdm_smpte.cc
index 00d8400555794ccdaf82426e6343bb16b541d7a2..d56d6c2c5df50d02352ca8e478305a041fd7fd68 100644 (file)
--- a/src/xml/kdm_smpte.cc
+++ b/src/xml/kdm_smpte.cc
@@ -63,12 +63,6 @@ DCinemaSecurityMessage::as_xml () const
        return writer.document;
 }
 
-AuthenticatedPublic::AuthenticatedPublic ()
-       : message_id ("urn:uuid:" + make_uuid ())
-{
-
-}
-
 AuthenticatedPublic::AuthenticatedPublic (shared_ptr<const cxml::Node> node)
        : message_id (node->string_child ("MessageId"))
        , message_type (node->string_child ("MessageType"))

diff --git a/src/xml/kdm_smpte.h b/src/xml/kdm_smpte.h
index 2e94a368264b1f56a0f56ea6d7cd9b662ae6cae6..8c5ea409c20c1d10f3bc5d80498e7c7e6e49891d 100644 (file)
--- a/src/xml/kdm_smpte.h
+++ b/src/xml/kdm_smpte.h
@@ -95,7 +95,7 @@ public:
 class AuthenticatedPublic
 {
 public:
-       AuthenticatedPublic ();
+       AuthenticatedPublic () {}
        AuthenticatedPublic (boost::shared_ptr<const cxml::Node>);
 
        void as_xml (Writer &, xmlpp::Element *) const;