X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdkdm_wrapper.cc;h=23539bd94a4912ae24c5b62a8e6e2bd740ab6506;hb=a332bd6be323f03dad5b180fb237afe54f1bf81e;hp=6638bc315bb3936c9e4933abbf3065580c93ecb2;hpb=1c11eaf92c5d592be6df07e2ac77cfcf65e3ed0c;p=dcpomatic.git diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc index 6638bc315..23539bd94 100644 --- a/src/lib/dkdm_wrapper.cc +++ b/src/lib/dkdm_wrapper.cc @@ -37,10 +37,6 @@ 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()) { @@ -67,20 +63,6 @@ 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 {