Fix silent stereo mixdown exports when the project audio channel count is > 6.

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

diff --git a/src/lib/screen.h b/src/lib/screen.h
index 6103d207d9bffc0870edbd194cee96ab75d56936..7f01cdf2792abb802f200b40fb1045f21b89a7c2 100644 (file)
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -25,8 +25,10 @@
 
 #include "kdm_with_metadata.h"
 #include "kdm_recipient.h"
+#include "kdm_util.h"
 #include "trusted_device.h"
 #include <dcp/certificate.h>
+#include <dcp/decrypted_kdm.h>
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <string>
@@ -62,7 +64,7 @@ public:
 
        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;
@@ -74,14 +76,14 @@ public:
 
 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,
        boost::posix_time::ptime valid_from,
        boost::posix_time::ptime valid_to,
        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
        );