swaroop: store whole signer/decryption chains and private keys encrypted by machine...

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

diff --git a/src/lib/config.h b/src/lib/config.h
index dd20b58e7d66974a1d7435dafb760ee68144886f..70d8f92008ba6fc3735476251da4ba82ced068bc 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -530,10 +530,6 @@ public:
        }
 #endif
 
-       bool allow_spl_editing () const {
-               return _allow_spl_editing;
-       }
-
        /* SET (mostly) */
 
        void set_master_encoding_threads (int n) {
@@ -1038,10 +1034,6 @@ public:
        }
 #endif
 
-       void set_allow_spl_editing (bool s) {
-               maybe_set (_allow_spl_editing, s);
-       }
-
        void changed (Property p = OTHER);
        boost::signals2::signal<void (Property)> Changed;
        /** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1180,10 +1172,16 @@ private:
        std::string _notification_bcc;
        std::string _notification_email;
        boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       boost::filesystem::path _signer_chain_path;
+#endif
        /** Chain used to decrypt KDMs; the leaf of this chain is the target
         *  certificate for making KDMs given to DCP-o-matic.
         */
        boost::shared_ptr<const dcp::CertificateChain> _decryption_chain;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       boost::filesystem::path _decryption_chain_path;
+#endif
        /** true to check for updates on startup */
        bool _check_for_updates;
        bool _check_for_test_updates;
@@ -1248,7 +1246,6 @@ private:
        /** a file which, if specified, must be present for the player to work */
        boost::optional<boost::filesystem::path> _player_lock_file;
 #endif
-       bool _allow_spl_editing;
 
        static int const _current_version;