diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-09-24 19:15:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-09-24 19:15:45 +0100 |
| commit | 1bf16b70c531b6b819a8339af395ff2a3c1e8977 (patch) | |
| tree | af7414d634f477af6bb949eb8edb0b6b4d220f82 /src | |
| parent | 725c1f0ead60e73e9dbc17337c416ac4d2720c55 (diff) | |
KDM XML fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdm.cc | 5 | ||||
| -rw-r--r-- | src/xml/kdm_smpte.cc | 6 | ||||
| -rw-r--r-- | src/xml/kdm_smpte.h | 2 |
3 files changed, 4 insertions, 9 deletions
@@ -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 00d84005..d56d6c2c 100644 --- 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 2e94a368..8c5ea409 100644 --- 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; |