projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove use of _formatted when writing subtitle XML.
[libdcp.git]
/
src
/
decrypted_kdm_key.h
diff --git
a/src/decrypted_kdm_key.h
b/src/decrypted_kdm_key.h
index 95ffccb80fd908e6687689afcb0da347095e17aa..3fee9a68963a46ca7fd9d9a646c65423633f9135 100644
(file)
--- a/
src/decrypted_kdm_key.h
+++ b/
src/decrypted_kdm_key.h
@@
-39,6
+39,8
@@
#define LIBDCP_DECRYPTED_KDM_KEY_H
#include "key.h"
#define LIBDCP_DECRYPTED_KDM_KEY_H
#include "key.h"
+#include "types.h"
+#include <boost/optional.hpp>
namespace dcp {
namespace dcp {
@@
-48,14
+50,15
@@
namespace dcp {
class DecryptedKDMKey
{
public:
class DecryptedKDMKey
{
public:
- DecryptedKDMKey (
std::string type, std::string id, Key key, std::string cpl_i
d)
+ DecryptedKDMKey (
boost::optional<std::string> type, std::string id, Key key, std::string cpl_id, Standard standar
d)
: _type (type)
, _id (id)
, _key (key)
, _cpl_id (cpl_id)
: _type (type)
, _id (id)
, _key (key)
, _cpl_id (cpl_id)
+ , _standard (standard)
{}
{}
-
std::string
type () const {
+
boost::optional<std::string>
type () const {
return _type;
}
return _type;
}
@@
-71,11
+74,16
@@
public:
return _cpl_id;
}
return _cpl_id;
}
+ Standard standard () const {
+ return _standard;
+ }
+
private:
private:
-
std::string
_type;
+
boost::optional<std::string>
_type;
std::string _id;
Key _key;
std::string _cpl_id;
std::string _id;
Key _key;
std::string _cpl_id;
+ Standard _standard;
};
bool operator== (DecryptedKDMKey const &, DecryptedKDMKey const &);
};
bool operator== (DecryptedKDMKey const &, DecryptedKDMKey const &);