From 6cde6bcc0b604c1a157a4ccbdce29e91f4d45a91 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 13 May 2019 17:20:01 +0100 Subject: swaroop: add name to ECinema KDMs and add DKDM wrapper for ECinema. --- src/lib/dkdm_wrapper.cc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/lib/dkdm_wrapper.cc') diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc index 76f9217aa..0dd37b464 100644 --- a/src/lib/dkdm_wrapper.cc +++ b/src/lib/dkdm_wrapper.cc @@ -34,6 +34,10 @@ DKDMBase::read (cxml::ConstNodePtr node) { if (node->name() == "DKDM") { return shared_ptr (new DKDM (dcp::EncryptedKDM (node->content ()))); +#ifdef DCPOMATIC_VARIANT_SWAROOP + } else if (node->name() == "ECinemaDKDM") { + return shared_ptr (new ECinemaDKDM(EncryptedECinemaKDM(node->content()))); +#endif } else if (node->name() == "DKDMGroup") { shared_ptr group (new DKDMGroup (node->string_attribute ("Name"))); BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children()) { @@ -60,6 +64,20 @@ DKDM::as_xml (xmlpp::Element* node) const node->add_child("DKDM")->add_child_text (_dkdm.as_xml ()); } +#ifdef DCPOMATIC_VARIANT_SWAROOP +string +ECinemaDKDM::name () const +{ + return String::compose ("%1 (%2)", _dkdm.name(), _dkdm.id()); +} + +void +ECinemaDKDM::as_xml (xmlpp::Element* node) const +{ + node->add_child("ECinemaDKDM")->add_child_text (_dkdm.as_xml()); +} +#endif + void DKDMGroup::as_xml (xmlpp::Element* node) const { -- cgit v1.2.3