diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-08 02:16:06 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-06-08 17:09:15 +0200 |
| commit | f330799459f44d031dc711b947dd2c0cc5a015a3 (patch) | |
| tree | bf88f9b620c6d88e350d73734e37ccf4c358eff0 /src/lib | |
| parent | 8755ef75cb001cf7fba230ffa98fb40eb2547849 (diff) | |
Remove encryption key options (#1760).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 7 | ||||
| -rw-r--r-- | src/lib/film.h | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 2aaeafca6..93a22d186 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1208,13 +1208,6 @@ Film::set_encrypted (bool e) _encrypted = e; } -void -Film::set_key (dcp::Key key) -{ - ChangeSignaller<Film> ch (this, KEY); - _key = key; -} - ContentList Film::content () const { diff --git a/src/lib/film.h b/src/lib/film.h index ea60b461d..7f7590210 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -61,6 +61,7 @@ class Ratio; class Job; class Film; struct isdcf_name_test; +struct recover_test_2d_encrypted; class InfoFileHandle { @@ -212,7 +213,6 @@ public: CONTAINER, RESOLUTION, ENCRYPTED, - KEY, J2K_BANDWIDTH, ISDCF_METADATA, VIDEO_FRAME_RATE, @@ -347,7 +347,6 @@ public: void set_container (Ratio const *, bool user_explicit = true); void set_resolution (Resolution, bool user_explicit = true); 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 rate, bool user_explicit = false); @@ -387,6 +386,7 @@ public: private: friend struct ::isdcf_name_test; + friend struct ::recover_test_2d_encrypted; template <typename> friend class ChangeSignaller; boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const; |