pot/merge.

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

diff --git a/src/lib/dkdm_wrapper.h b/src/lib/dkdm_wrapper.h
index 261cdc76751e112b511b49e8b390d8cb21aaa858..7182e5e85794d7c401c851b58e8fd36103d48430 100644 (file)
--- 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,6 +18,7 @@
 
 */
 
+
 #include <dcp/encrypted_kdm.h>
 #include <libcxml/cxml.h>
 #include <memory>
@@ -27,14 +28,18 @@ namespace xmlpp {
        class Element;
 }
 
+
 class DKDMGroup;
 
+
 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 std::shared_ptr<DKDMBase> read (cxml::ConstNodePtr node);
 
@@ -50,6 +55,7 @@ private:
        std::shared_ptr<DKDMGroup> _parent;
 };
 
+
 class DKDM : public DKDMBase
 {
 public:
@@ -57,8 +63,11 @@ public:
                : _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;
@@ -68,6 +77,7 @@ private:
        dcp::EncryptedKDM _dkdm;
 };
 
+
 class DKDMGroup : public DKDMBase
 {
 public:
@@ -75,20 +85,24 @@ public:
                : _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<std::shared_ptr<DKDMBase> > children () const {
+       bool contains_dkdm() const override;
+
+       std::list<std::shared_ptr<DKDMBase>> children () const {
                return _children;
        }
 
-       void add (std::shared_ptr<DKDMBase> child, std::shared_ptr<DKDM> previous = std::shared_ptr<DKDM> ());
+       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<std::shared_ptr<DKDMBase> > _children;
+       std::list<std::shared_ptr<DKDMBase>> _children;
 };