Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption key.

2 files changed, 13 insertions, 4 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 7dbeaafe9..5e08ed997 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -881,6 +881,13 @@ Film::set_encrypted (bool e)
 	signal_changed (ENCRYPTED);
 }
 
+void
+Film::set_key (dcp::Key key)
+{
+	_key = key;
+	signal_changed (KEY);
+}
+
 shared_ptr<Playlist>
 Film::playlist () const
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index cca31d306..5eb4f17ed 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -133,10 +133,6 @@ public:
 		dcp::Formulation formulation
 		) const;
 
-	dcp::Key key () const {
-		return _key;
-	}
-
 	int state_version () const {
 		return _state_version;
 	}
@@ -157,6 +153,7 @@ public:
 		RESOLUTION,
 		SIGNED,
 		ENCRYPTED,
+		KEY,
 		J2K_BANDWIDTH,
 		ISDCF_METADATA,
 		VIDEO_FRAME_RATE,
@@ -205,6 +202,10 @@ public:
 		return _encrypted;
 	}
 
+	dcp::Key key () const {
+		return _key;
+	}
+
 	int j2k_bandwidth () const {
 		return _j2k_bandwidth;
 	}
@@ -255,6 +256,7 @@ public:
 	void set_resolution (Resolution);
 	void set_signed (bool);
 	void set_encrypted (bool);
+	void set_key (dcp::Key key);
 	void set_j2k_bandwidth (int);
 	void set_isdcf_metadata (ISDCFMetadata);
 	void set_video_frame_rate (int);