X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdkdm_wrapper.h;h=09e9d25c428c3808869fc6b20429edcc9fa73876;hp=d3ee2a09566c34afaa48036fa8bff507ed6ccf9b;hb=HEAD;hpb=ba049fdab4a47023d6d5ee8b5ff9bbb710afbabb

diff --git a/src/lib/dkdm_wrapper.h b/src/lib/dkdm_wrapper.h
index d3ee2a095..7182e5e85 100644
--- a/src/lib/dkdm_wrapper.h
+++ b/src/lib/dkdm_wrapper.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,45 +18,56 @@
 
 */
 
+
 #include <dcp/encrypted_kdm.h>
 #include <libcxml/cxml.h>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
+
 
 namespace xmlpp {
 	class Element;
 }
 
+
 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;
+	/** @return true if this thing is, or contains, any actual DKDM */
+	virtual bool contains_dkdm() 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
 {
 public:
-	DKDM (dcp::EncryptedKDM k)
+	explicit DKDM (dcp::EncryptedKDM k)
 		: _dkdm (k)
 	{}
 
-	std::string name () const;
-	void as_xml (xmlpp::Element *) const;
+	std::string name () const override;
+	void as_xml (xmlpp::Element *) const override;
+	bool contains_dkdm() const override {
+		return true;
+	}
 
 	dcp::EncryptedKDM dkdm () const {
 		return _dkdm;
@@ -66,27 +77,32 @@ private:
 	dcp::EncryptedKDM _dkdm;
 };
 
+
 class DKDMGroup : public DKDMBase
 {
 public:
-	DKDMGroup (std::string name)
+	explicit DKDMGroup (std::string name)
 		: _name (name)
 	{}
 
-	std::string name () const {
+	std::string name () const override {
 		return _name;
 	}
 
-	void as_xml (xmlpp::Element *) const;
+	void as_xml (xmlpp::Element *) const override;
 
-	std::list<boost::shared_ptr<DKDMBase> > children () const {
+	bool contains_dkdm() const override;
+
+	std::list<std::shared_ptr<DKDMBase>> children () const {
 		return _children;
 	}
 
-	void add (boost::shared_ptr<DKDMBase> child);
-        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);
+
+	bool contains(std::string dkdm_id) const;
 
 private:
 	std::string _name;
-	std::list<boost::shared_ptr<DKDMBase> > _children;
+	std::list<std::shared_ptr<DKDMBase>> _children;
 };