X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=4656da9de81f08c04385a97f23fbbfff7f6db931;hb=1e77753ef4119b6d7df7d2255b1a1d8d6af951de;hp=273077f8f5c646766eef6fc525bf302c2704ea1c;hpb=fad8d13cd779a6237feed2c855a46e1a7c66e0ad;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 273077f8f..4656da9de 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -130,7 +130,7 @@ public:
 
 	dcp::EncryptedKDM make_kdm (
 		dcp::Certificate recipient,
-		std::vector<dcp::Certificate> trusted_devices,
+		std::vector<std::string> trusted_devices,
 		boost::filesystem::path cpl_file,
 		dcp::LocalTime from,
 		dcp::LocalTime until,
@@ -204,7 +204,8 @@ public:
 		AUDIO_PROCESSOR,
 		REEL_TYPE,
 		REEL_LENGTH,
-		UPLOAD_AFTER_MAKE_DCP
+		UPLOAD_AFTER_MAKE_DCP,
+		REENCODE_J2K
 	};
 
 
@@ -296,6 +297,10 @@ public:
 		return _context_id;
 	}
 
+	bool reencode_j2k () const {
+		return _reencode_j2k;
+	}
+
 
 	/* SET */
 
@@ -326,6 +331,7 @@ public:
 	void set_reel_type (ReelType);
 	void set_reel_length (int64_t);
 	void set_upload_after_make_dcp (bool);
+	void set_reencode_j2k (bool);
 
 	/** Emitted when some property has of the Film is about to change or has changed */
 	mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -399,6 +405,7 @@ private:
 	/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
 	int64_t _reel_length;
 	bool _upload_after_make_dcp;
+	bool _reencode_j2k;
 
 	int _state_version;