Add option to analyse audio automatically when content is added (#673).

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 573d2b29277953a08161ed297b6e9216a3b07a58..2f68ea31cb7b91cc5e085f78fee121400ae87ef8 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -25,18 +25,13 @@
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
-#include "video_content.h"
-#include <dcp/metadata.h>
-#include <dcp/certificate.h>
+#include "types.h"
 #include <dcp/certificate_chain.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 #include <vector>
 
-class ServerDescription;
-class Scaler;
-class Filter;
 class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
@@ -90,6 +85,10 @@ public:
                return _servers;
        }
 
+       bool only_servers_encode () const {
+               return _only_servers_encode;
+       }
+
        Protocol tms_protocol () const {
                return _tms_protocol;
        }
@@ -155,6 +154,10 @@ public:
                return _dcp_issuer;
        }
 
+       std::string dcp_creator () const {
+               return _dcp_creator;
+       }
+
        int default_j2k_bandwidth () const {
                return _default_j2k_bandwidth;
        }
@@ -203,12 +206,8 @@ public:
                return _signer_chain;
        }
 
-       dcp::Certificate decryption_certificate () const {
-               return _decryption_certificate;
-       }
-
-       std::string decryption_private_key () const {
-               return _decryption_private_key;
+       boost::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
+               return _decryption_chain;
        }
 
        bool check_for_updates () const {
@@ -227,6 +226,10 @@ public:
                return _log_types;
        }
 
+       bool automatic_audio_analysis () const {
+               return _automatic_audio_analysis;
+       }
+
 #ifdef DCPOMATIC_WINDOWS
        bool win32_console () const {
                return _win32_console;
@@ -251,6 +254,10 @@ public:
                maybe_set (_server_port_base, p);
        }
 
+       void set_only_servers_encode (bool o) {
+               maybe_set (_only_servers_encode, o);
+       }
+
        void set_tms_protocol (Protocol p) {
                maybe_set (_tms_protocol, p);
        }
@@ -330,6 +337,10 @@ public:
                maybe_set (_dcp_issuer, i);
        }
 
+       void set_dcp_creator (std::string c) {
+               maybe_set (_dcp_creator, c);
+       }
+
        void set_default_j2k_bandwidth (int b) {
                maybe_set (_default_j2k_bandwidth, b);
        }
@@ -380,12 +391,8 @@ public:
                maybe_set (_signer_chain, s);
        }
 
-       void set_decryption_certificate (dcp::Certificate c) {
-               maybe_set (_decryption_certificate, c);
-       }
-
-       void set_decryption_private_key (std::string k) {
-               maybe_set (_decryption_private_key, k);
+       void set_decryption_chain (boost::shared_ptr<const dcp::CertificateChain> c) {
+               maybe_set (_decryption_chain, c);
        }
 
        void set_check_for_updates (bool c) {
@@ -404,6 +411,10 @@ public:
                maybe_set (_log_types, t);
        }
 
+       void set_automatic_audio_analysis (bool a) {
+               maybe_set (_automatic_audio_analysis, a);
+       }
+
 #ifdef DCPOMATIC_WINDOWS
        void set_win32_console (bool c) {
                maybe_set (_win32_console, c);
@@ -425,12 +436,12 @@ public:
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
+       static bool have_existing ();
 
 private:
        Config ();
-       boost::filesystem::path file () const;
+       static boost::filesystem::path file (bool create_directories = true);
        void read ();
-       void make_decryption_keys ();
        void set_defaults ();
        void set_kdm_email_to_default ();
 
@@ -455,6 +466,7 @@ private:
        bool _use_any_servers;
        /** J2K encoding servers that should definitely be used */
        std::vector<std::string> _servers;
+       bool _only_servers_encode;
        Protocol _tms_protocol;
        /** The IP address of a TMS that we can copy DCPs to */
        std::string _tms_ip;
@@ -477,6 +489,7 @@ private:
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
        std::string _dcp_issuer;
+       std::string _dcp_creator;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        std::list<boost::shared_ptr<Cinema> > _cinemas;
@@ -490,14 +503,17 @@ private:
        std::string _kdm_bcc;
        std::string _kdm_email;
        boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
-       dcp::Certificate _decryption_certificate;
-       std::string _decryption_private_key;
+       /** 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;
        /** true to check for updates on startup */
        bool _check_for_updates;
        bool _check_for_test_updates;
        /** maximum allowed J2K bandwidth in bits per second */
        int _maximum_j2k_bandwidth;
        int _log_types;
+       bool _automatic_audio_analysis;
 #ifdef DCPOMATIC_WINDOWS
        bool _win32_console;
 #endif