projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change end() to only do one thing, and copy the required stuff into pause()
[dcpomatic.git]
/
src
/
lib
/
screen.h
diff --git
a/src/lib/screen.h
b/src/lib/screen.h
index 6103d207d9bffc0870edbd194cee96ab75d56936..0a275aa34c9407e3403935e21c0c6dfb9639e91c 100644
(file)
--- a/
src/lib/screen.h
+++ b/
src/lib/screen.h
@@
-23,10
+23,13
@@
#define DCPOMATIC_SCREEN_H
#define DCPOMATIC_SCREEN_H
-#include "kdm_with_metadata.h"
#include "kdm_recipient.h"
#include "kdm_recipient.h"
+#include "kdm_util.h"
+#include "kdm_with_metadata.h"
#include "trusted_device.h"
#include <dcp/certificate.h>
#include "trusted_device.h"
#include <dcp/certificate.h>
+#include <dcp/decrypted_kdm.h>
+#include <dcp/utc_offset.h>
#include <libcxml/cxml.h>
#include <boost/optional.hpp>
#include <string>
#include <libcxml/cxml.h>
#include <boost/optional.hpp>
#include <string>
@@
-62,7
+65,7
@@
public:
explicit Screen (cxml::ConstNodePtr);
explicit Screen (cxml::ConstNodePtr);
- void as_xml (xmlpp::Element *) const;
+ void as_xml (xmlpp::Element *) const
override
;
std::vector<std::string> trusted_device_thumbprints () const;
std::shared_ptr<Cinema> cinema;
std::vector<std::string> trusted_device_thumbprints () const;
std::shared_ptr<Cinema> cinema;
@@
-74,14
+77,14
@@
public:
KDMWithMetadataPtr
kdm_for_screen (
KDMWithMetadataPtr
kdm_for_screen (
- std::shared_ptr<const Film> film,
- boost::filesystem::path cpl,
+ std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm,
std::shared_ptr<const dcpomatic::Screen> screen,
std::shared_ptr<const dcpomatic::Screen> screen,
-
boost::posix_time::pt
ime valid_from,
-
boost::posix_time::pt
ime valid_to,
+
dcp::LocalT
ime valid_from,
+
dcp::LocalT
ime valid_to,
dcp::Formulation formulation,
bool disable_forensic_marking_picture,
dcp::Formulation formulation,
bool disable_forensic_marking_picture,
- boost::optional<int> disable_forensic_marking_audio
+ boost::optional<int> disable_forensic_marking_audio,
+ std::vector<KDMCertificatePeriod>& period_checks
);
);