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

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 3d1c02c93a7db30b95ecd3140a7919b46aabffa6..5eb4f17ed40be1681feb8819f2ffddd4935979c2 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -61,9 +61,8 @@ public:
        Film (boost::filesystem::path, bool log = true);
        ~Film ();
 
-       boost::filesystem::path info_dir () const;
+       boost::filesystem::path info_file () const;
        boost::filesystem::path j2c_path (int, Eyes, bool) const;
-       boost::filesystem::path info_path (int, Eyes) const;
        boost::filesystem::path internal_video_mxf_dir () const;
        boost::filesystem::path internal_video_mxf_filename () const;
        boost::filesystem::path audio_analysis_dir () const;
@@ -82,8 +81,6 @@ public:
                return _log;
        }
 
-       int encoded_frames () const;
-       
        boost::filesystem::path file (boost::filesystem::path f) const;
        boost::filesystem::path dir (boost::filesystem::path d) const;
 
@@ -136,10 +133,6 @@ public:
                dcp::Formulation formulation
                ) const;
 
-       dcp::Key key () const {
-               return _key;
-       }
-
        int state_version () const {
                return _state_version;
        }
@@ -160,6 +153,7 @@ public:
                RESOLUTION,
                SIGNED,
                ENCRYPTED,
+               KEY,
                J2K_BANDWIDTH,
                ISDCF_METADATA,
                VIDEO_FRAME_RATE,
@@ -208,6 +202,10 @@ public:
                return _encrypted;
        }
 
+       dcp::Key key () const {
+               return _key;
+       }
+
        int j2k_bandwidth () const {
                return _j2k_bandwidth;
        }
@@ -258,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);