Cleanup: extract encrypt() call from Film::make_kdm().

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

diff --git a/src/lib/film.h b/src/lib/film.h
index b1451c212092b2ec5435ef8cb00c6b46a3093008..d059099ee521e7c5d8f9ae7daa4afa2907df799f 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -33,9 +33,12 @@
 #include "dcp_text_track.h"
 #include "dcpomatic_time.h"
 #include "frame_rate_change.h"
+#include "named_channel.h"
+#include "resolution.h"
 #include "signaller.h"
 #include "transcode_job.h"
 #include "types.h"
+#include "util.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/file.h>
 #include <dcp/key.h>
@@ -68,6 +71,7 @@ class Ratio;
 class Job;
 class Film;
 struct isdcf_name_test;
+struct isdcf_name_with_atmos;
 struct recover_test_2d_encrypted;
 struct atmos_encrypted_passthrough_test;
 
@@ -163,16 +167,7 @@ public:
        FrameRateChange active_frame_rate_change (dcpomatic::DCPTime) const;
        std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
 
-       dcp::EncryptedKDM make_kdm (
-               dcp::Certificate recipient,
-               std::vector<std::string> trusted_devices,
-               boost::filesystem::path cpl_file,
-               dcp::LocalTime from,
-               dcp::LocalTime until,
-               dcp::Formulation formulation,
-               bool disable_forensic_marking_picture,
-               boost::optional<int> disable_forensic_marking_audio
-               ) const;
+       dcp::DecryptedKDM make_kdm(boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until) const;
 
        int state_version () const {
                return _state_version;
@@ -490,6 +485,7 @@ public:
 private:
 
        friend struct ::isdcf_name_test;
+       friend struct ::isdcf_name_with_atmos;
        friend struct ::recover_test_2d_encrypted;
        friend struct ::atmos_encrypted_passthrough_test;
        template <class, class> friend class ChangeSignaller;