X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=426c7f81ddeb30bb0b90b4a26db8e6edacf8c5d6;hb=1e77753ef4119b6d7df7d2255b1a1d8d6af951de;hp=807aeaf2fe3d59d9ac0f7d6a8791436d5efb16a4;hpb=fad8d13cd779a6237feed2c855a46e1a7c66e0ad;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 807aeaf2f..426c7f81d 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -157,6 +157,7 @@ Film::Film (optional<boost::filesystem::path> dir)
 	, _reel_type (REELTYPE_SINGLE)
 	, _reel_length (2000000000)
 	, _upload_after_make_dcp (Config::instance()->default_upload_after_make_dcp())
+	, _reencode_j2k (false)
 	, _state_version (current_state_version)
 	, _dirty (false)
 {
@@ -398,6 +399,7 @@ Film::metadata (bool with_content_paths) const
 	root->add_child("ReelType")->add_child_text (raw_convert<string> (static_cast<int> (_reel_type)));
 	root->add_child("ReelLength")->add_child_text (raw_convert<string> (_reel_length));
 	root->add_child("UploadAfterMakeDCP")->add_child_text (_upload_after_make_dcp ? "1" : "0");
+	root->add_child("ReencodeJ2K")->add_child_text (_reencode_j2k ? "1" : "0");
 	_playlist->as_xml (root->add_child ("Playlist"), with_content_paths);
 
 	return doc;
@@ -512,6 +514,7 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 	_reel_type = static_cast<ReelType> (f.optional_number_child<int>("ReelType").get_value_or (static_cast<int>(REELTYPE_SINGLE)));
 	_reel_length = f.optional_number_child<int64_t>("ReelLength").get_value_or (2000000000);
 	_upload_after_make_dcp = f.optional_bool_child("UploadAfterMakeDCP").get_value_or (false);
+	_reencode_j2k = f.optional_bool_child("ReencodeJ2K").get_value_or(false);
 
 	list<string> notes;
 	/* This method is the only one that can return notes (so far) */
@@ -943,6 +946,13 @@ Film::set_upload_after_make_dcp (bool u)
 	_upload_after_make_dcp = u;
 }
 
+void
+Film::set_reencode_j2k (bool r)
+{
+	ChangeSignaller<Film> ch (this, REENCODE_J2K);
+	_reencode_j2k = r;
+}
+
 void
 Film::signal_change (ChangeType type, int p)
 {
@@ -1249,7 +1259,7 @@ Film::frame_size () const
 }
 
 /** @param recipient KDM recipient certificate.
- *  @param trusted_devices Certificates of other trusted devices (can be empty).
+ *  @param trusted_devices Certificate thumbprints of other trusted devices (can be empty).
  *  @param cpl_file CPL filename.
  *  @param from KDM from time expressed as a local time with an offset from UTC.
  *  @param until KDM to time expressed as a local time with an offset from UTC.
@@ -1261,7 +1271,7 @@ Film::frame_size () const
 dcp::EncryptedKDM
 Film::make_kdm (
 	dcp::Certificate recipient,
-	vector<dcp::Certificate> trusted_devices,
+	vector<string> trusted_devices,
 	boost::filesystem::path cpl_file,
 	dcp::LocalTime from,
 	dcp::LocalTime until,
@@ -1347,7 +1357,7 @@ Film::make_kdms (
 		if (i->recipient) {
 			dcp::EncryptedKDM const kdm = make_kdm (
 				i->recipient.get(),
-				i->trusted_devices,
+				i->trusted_device_thumbprints(),
 				cpl_file,
 				dcp::LocalTime (from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
 				dcp::LocalTime (until, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),