X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=e5795d2c300db8ac02b02cb4c6f97369d713900d;hb=4a994bc4d9ce9afefdfb668bf9fc0280b1f7c66d;hp=913c2abc3913fc11444b82ab14bfbbe35d5f74b8;hpb=0242efb9802d7bcbde0701a7267972d4dbe5abb8;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 913c2abc3..e5795d2c3 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -25,18 +25,14 @@ #define DCPOMATIC_CONFIG_H #include "isdcf_metadata.h" -#include "video_content.h" -#include -#include +#include "types.h" #include +#include #include #include #include #include -class ServerDescription; -class Scaler; -class Filter; class CinemaSoundProcessor; class DCPContentType; class Ratio; @@ -90,6 +86,10 @@ public: return _servers; } + bool only_servers_encode () const { + return _only_servers_encode; + } + Protocol tms_protocol () const { return _tms_protocol; } @@ -155,6 +155,10 @@ public: return _dcp_issuer; } + std::string dcp_creator () const { + return _dcp_creator; + } + int default_j2k_bandwidth () const { return _default_j2k_bandwidth; } @@ -163,6 +167,10 @@ public: return _default_audio_delay; } + bool default_interop () const { + return _default_interop; + } + std::string mail_server () const { return _mail_server; } @@ -187,7 +195,7 @@ public: return _kdm_from; } - std::string kdm_cc () const { + std::vector kdm_cc () const { return _kdm_cc; } @@ -199,16 +207,12 @@ public: return _kdm_email; } - boost::shared_ptr signer () const { - return _signer; - } - - dcp::Certificate decryption_certificate () const { - return _decryption_certificate; + boost::shared_ptr signer_chain () const { + return _signer_chain; } - std::string decryption_private_key () const { - return _decryption_private_key; + boost::shared_ptr decryption_chain () const { + return _decryption_chain; } bool check_for_updates () const { @@ -227,6 +231,14 @@ public: return _log_types; } + bool analyse_ebur128 () const { + return _analyse_ebur128; + } + + bool automatic_audio_analysis () const { + return _automatic_audio_analysis; + } + #ifdef DCPOMATIC_WINDOWS bool win32_console () const { return _win32_console; @@ -237,6 +249,14 @@ public: return _history; } + std::vector dkdms () const { + return _dkdms; + } + + boost::filesystem::path cinemas_file () const { + return _cinemas_file; + } + /** @param n New number of local encoding threads */ void set_num_local_encoding_threads (int n) { maybe_set (_num_local_encoding_threads, n); @@ -251,6 +271,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 +354,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); } @@ -338,6 +366,10 @@ public: maybe_set (_default_audio_delay, d); } + void set_default_interop (bool i) { + maybe_set (_default_interop, i); + } + void set_mail_server (std::string s) { maybe_set (_mail_server, s); } @@ -362,7 +394,7 @@ public: maybe_set (_kdm_from, f); } - void set_kdm_cc (std::string f) { + void set_kdm_cc (std::vector f) { maybe_set (_kdm_cc, f); } @@ -376,20 +408,19 @@ public: void reset_kdm_email (); - void set_signer (boost::shared_ptr s) { - maybe_set (_signer, s); + void set_signer_chain (boost::shared_ptr s) { + 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 c) { + maybe_set (_decryption_chain, c); } void set_check_for_updates (bool c) { maybe_set (_check_for_updates, c); + if (!c) { + set_check_for_test_updates (false); + } } void set_check_for_test_updates (bool c) { @@ -404,12 +435,28 @@ public: maybe_set (_log_types, t); } + void set_analyse_ebur128 (bool a) { + maybe_set (_analyse_ebur128, a); + } + + 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); } #endif + void set_dkdms (std::vector dkdms) + { + _dkdms = dkdms; + changed (); + } + + void set_cinemas_file (boost::filesystem::path file); + void clear_history () { _history.clear (); changed (); @@ -425,14 +472,18 @@ public: static Config* instance (); static void drop (); static void restore_defaults (); + static bool have_existing (std::string); private: Config (); - boost::filesystem::path file () const; + static boost::filesystem::path path (std::string file, bool create_directories = true); void read (); - void make_decryption_keys (); void set_defaults (); void set_kdm_email_to_default (); + void write_config_xml () const; + void write_cinemas_xml () const; + void read_cinemas (cxml::Document const & f); + boost::shared_ptr create_certificate_chain (); template void maybe_set (T& member, T new_value) { @@ -448,13 +499,14 @@ private: /** default directory to put new films in */ boost::filesystem::path _default_directory; /** base port number to use for J2K encoding servers; - * this port and the one above it will be used. + * this port and the two above it will be used. */ int _server_port_base; /** true to broadcast on the `any' address to look for servers */ bool _use_any_servers; /** J2K encoding servers that should definitely be used */ std::vector _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,8 +529,10 @@ 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; + bool _default_interop; std::list > _cinemas; std::string _mail_server; int _mail_port; @@ -486,22 +540,28 @@ private: std::string _mail_password; std::string _kdm_subject; std::string _kdm_from; - std::string _kdm_cc; + std::vector _kdm_cc; std::string _kdm_bcc; std::string _kdm_email; - boost::shared_ptr _signer; - dcp::Certificate _decryption_certificate; - std::string _decryption_private_key; + boost::shared_ptr _signer_chain; + /** 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 _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 _analyse_ebur128; + bool _automatic_audio_analysis; #ifdef DCPOMATIC_WINDOWS bool _win32_console; #endif std::vector _history; + std::vector _dkdms; + boost::filesystem::path _cinemas_file; /** Singleton instance, or 0 */ static Config* _instance;