Test churn from adding make_uuid() into CPL.

[libdcp.git] / src / decrypted_kdm_key.h

diff --git a/src/decrypted_kdm_key.h b/src/decrypted_kdm_key.h
index 95ffccb80fd908e6687689afcb0da347095e17aa..f1218d3f0a872813e4ba73648b57ed992d0bf378 100644 (file)
--- a/src/decrypted_kdm_key.h
+++ b/src/decrypted_kdm_key.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,31 +31,39 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/decrypted_kdm_key.h
  *  @brief DecryptedKDMKey class
  */
 
+
 #ifndef LIBDCP_DECRYPTED_KDM_KEY_H
 #define LIBDCP_DECRYPTED_KDM_KEY_H
 
+
 #include "key.h"
+#include "types.h"
+#include <boost/optional.hpp>
+
 
 namespace dcp {
 
+
 /** @class DecryptedKDMKey
- *  @brief An un- or de-crypted key from a KDM.
+ *  @brief An un- or de-crypted key from a KDM
  */
 class DecryptedKDMKey
 {
 public:
-       DecryptedKDMKey (std::string type, std::string id, Key key, std::string cpl_id)
+       DecryptedKDMKey (boost::optional<std::string> type, std::string id, Key key, std::string cpl_id, Standard standard)
                : _type (type)
                , _id (id)
                , _key (key)
                , _cpl_id (cpl_id)
+               , _standard (standard)
        {}
 
-       std::string type () const {
+       boost::optional<std::string> type () const {
                return _type;
        }
 
@@ -71,15 +79,23 @@ public:
                return _cpl_id;
        }
 
+       Standard standard () const {
+               return _standard;
+       }
+
 private:
-       std::string _type;
+       boost::optional<std::string> _type;
        std::string _id;
        Key _key;
        std::string _cpl_id;
+       Standard _standard;
 };
 
+
 bool operator== (DecryptedKDMKey const &, DecryptedKDMKey const &);
 
+
 }
 
+
 #endif