More enum class additions.

[dcpomatic.git] / src / lib / dkdm_wrapper.h

diff --git a/src/lib/dkdm_wrapper.h b/src/lib/dkdm_wrapper.h
index d828ffac2536a4298563764ae58a4c390321aa03..261cdc76751e112b511b49e8b390d8cb21aaa858 100644 (file)
--- a/src/lib/dkdm_wrapper.h
+++ b/src/lib/dkdm_wrapper.h
@@ -18,12 +18,10 @@
 
 */
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-#include "encrypted_ecinema_kdm.h"
-#endif
 #include <dcp/encrypted_kdm.h>
 #include <libcxml/cxml.h>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
+
 
 namespace xmlpp {
        class Element;
@@ -31,25 +29,25 @@ namespace xmlpp {
 
 class DKDMGroup;
 
-class DKDMBase : public boost::enable_shared_from_this<DKDMBase>
+class DKDMBase : public std::enable_shared_from_this<DKDMBase>
 {
 public:
        virtual ~DKDMBase () {}
        virtual std::string name () const = 0;
        virtual void as_xml (xmlpp::Element *) const = 0;
 
-       static boost::shared_ptr<DKDMBase> read (cxml::ConstNodePtr node);
+       static std::shared_ptr<DKDMBase> read (cxml::ConstNodePtr node);
 
-       boost::shared_ptr<DKDMGroup> parent () const {
+       std::shared_ptr<DKDMGroup> parent () const {
                return _parent;
        }
 
-       void set_parent (boost::shared_ptr<DKDMGroup> parent) {
+       void set_parent (std::shared_ptr<DKDMGroup> parent) {
                _parent = parent;
        }
 
 private:
-       boost::shared_ptr<DKDMGroup> _parent;
+       std::shared_ptr<DKDMGroup> _parent;
 };
 
 class DKDM : public DKDMBase
@@ -70,26 +68,6 @@ private:
        dcp::EncryptedKDM _dkdm;
 };
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-class ECinemaDKDM : public DKDMBase
-{
-public:
-       explicit ECinemaDKDM (EncryptedECinemaKDM k)
-               : _dkdm (k)
-       {}
-
-       std::string name () const;
-       void as_xml (xmlpp::Element *) const;
-
-       EncryptedECinemaKDM dkdm () const {
-               return _dkdm;
-       }
-
-private:
-       EncryptedECinemaKDM _dkdm;
-};
-#endif
-
 class DKDMGroup : public DKDMBase
 {
 public:
@@ -103,14 +81,14 @@ public:
 
        void as_xml (xmlpp::Element *) const;
 
-       std::list<boost::shared_ptr<DKDMBase> > children () const {
+       std::list<std::shared_ptr<DKDMBase> > children () const {
                return _children;
        }
 
-       void add (boost::shared_ptr<DKDMBase> child, boost::shared_ptr<DKDM> previous = boost::shared_ptr<DKDM> ());
-        void remove (boost::shared_ptr<DKDMBase> child);
+       void add (std::shared_ptr<DKDMBase> child, std::shared_ptr<DKDM> previous = std::shared_ptr<DKDM> ());
+        void remove (std::shared_ptr<DKDMBase> child);
 
 private:
        std::string _name;
-       std::list<boost::shared_ptr<DKDMBase> > _children;
+       std::list<std::shared_ptr<DKDMBase> > _children;
 };