projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move some functions to kdm_with_metadata
[dcpomatic.git]
/
src
/
lib
/
decrypted_ecinema_kdm.h
diff --git
a/src/lib/decrypted_ecinema_kdm.h
b/src/lib/decrypted_ecinema_kdm.h
index f61402b7bffab17f5638741197bc361f5e4436ae..7a66b63e09dbfa32d994ce5bba9804d5436784ef 100644
(file)
--- a/
src/lib/decrypted_ecinema_kdm.h
+++ b/
src/lib/decrypted_ecinema_kdm.h
@@
-28,7
+28,7
@@
class DecryptedECinemaKDM
{
public:
class DecryptedECinemaKDM
{
public:
- DecryptedECinemaKDM (std::string id,
dcp::Key content_key
);
+ DecryptedECinemaKDM (std::string id,
std::string name, dcp::Key content_key, boost::optional<dcp::LocalTime> not_valid_before, boost::optional<dcp::LocalTime> not_valid_after
);
DecryptedECinemaKDM (EncryptedECinemaKDM kdm, std::string private_key);
EncryptedECinemaKDM encrypt (dcp::Certificate recipient);
DecryptedECinemaKDM (EncryptedECinemaKDM kdm, std::string private_key);
EncryptedECinemaKDM encrypt (dcp::Certificate recipient);
@@
-37,14
+37,29
@@
public:
return _id;
}
return _id;
}
+ std::string name () const {
+ return _name;
+ }
+
dcp::Key key () const {
return _content_key;
}
dcp::Key key () const {
return _content_key;
}
+ boost::optional<dcp::LocalTime> not_valid_before () const {
+ return _not_valid_before;
+ }
+
+ boost::optional<dcp::LocalTime> not_valid_after () const {
+ return _not_valid_after;
+ }
+
private:
std::string _id;
private:
std::string _id;
+ std::string _name;
/** unenecrypted content key */
dcp::Key _content_key;
/** unenecrypted content key */
dcp::Key _content_key;
+ boost::optional<dcp::LocalTime> _not_valid_before;
+ boost::optional<dcp::LocalTime> _not_valid_after;
};
#endif
};
#endif