X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=579527975db2153892302d32232215b974f77da5;hp=45a9e282b7aed6ea638c540d264defd3df26b21a;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=e894cfe3d891135d1b92b62603a464e42bd6ed5c diff --git a/src/lib/config.h b/src/lib/config.h index 45a9e282b..579527975 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,19 +25,13 @@ #define DCPOMATIC_CONFIG_H #include "isdcf_metadata.h" -#include "colour_conversion.h" -#include "video_content.h" -#include -#include -#include +#include "types.h" +#include #include #include #include #include -class ServerDescription; -class Scaler; -class Filter; class CinemaSoundProcessor; class DCPContentType; class Ratio; @@ -49,7 +43,6 @@ class Cinema; class Config : public boost::noncopyable { public: - /** @return number of threads to use for J2K encoding on the local machine */ int num_local_encoding_threads () const { return _num_local_encoding_threads; @@ -61,6 +54,12 @@ public: boost::filesystem::path default_directory_or (boost::filesystem::path a) const; + enum Property { + USE_ANY_SERVERS, + SERVERS, + OTHER + }; + /** @return base port number to use for J2K encoding servers */ int server_port_base () const { return _server_port_base; @@ -68,7 +67,7 @@ public: void set_use_any_servers (bool u) { _use_any_servers = u; - changed (); + changed (USE_ANY_SERVERS); } bool use_any_servers () const { @@ -78,7 +77,7 @@ public: /** @param s New list of servers */ void set_servers (std::vector s) { _servers = s; - changed (); + changed (SERVERS); } /** @return Host names / IP addresses of J2K encoding servers that should definitely be used */ @@ -86,11 +85,19 @@ public: return _servers; } + bool only_servers_encode () const { + return _only_servers_encode; + } + + Protocol tms_protocol () const { + return _tms_protocol; + } + /** @return The IP address of a TMS that we can copy DCPs to */ std::string tms_ip () const { return _tms_ip; } - + /** @return The path on a TMS that we should changed DCPs to */ std::string tms_path () const { return _tms_path; @@ -114,7 +121,7 @@ public: std::list > cinemas () const { return _cinemas; } - + std::list allowed_dcp_frame_rates () const { return _allowed_dcp_frame_rates; } @@ -122,7 +129,7 @@ public: bool allow_any_dcp_frame_rate () const { return _allow_any_dcp_frame_rate; } - + ISDCFMetadata default_isdcf_metadata () const { return _default_isdcf_metadata; } @@ -147,6 +154,10 @@ public: return _dcp_issuer; } + std::string dcp_creator () const { + return _dcp_creator; + } + int default_j2k_bandwidth () const { return _default_j2k_bandwidth; } @@ -155,14 +166,18 @@ public: return _default_audio_delay; } - std::vector colour_conversions () const { - return _colour_conversions; + bool default_interop () const { + return _default_interop; } std::string mail_server () const { return _mail_server; } + int mail_port () const { + return _mail_port; + } + std::string mail_user () const { return _mail_user; } @@ -186,21 +201,17 @@ public: std::string kdm_bcc () const { return _kdm_bcc; } - + std::string kdm_email () const { 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 { @@ -219,11 +230,15 @@ public: return _log_types; } -#ifdef DCPOMATIC_WINDOWS + bool automatic_audio_analysis () const { + return _automatic_audio_analysis; + } + +#ifdef DCPOMATIC_WINDOWS bool win32_console () const { return _win32_console; } -#endif +#endif std::vector history () const { return _history; @@ -231,43 +246,44 @@ public: /** @param n New number of local encoding threads */ void set_num_local_encoding_threads (int n) { - _num_local_encoding_threads = n; - changed (); + maybe_set (_num_local_encoding_threads, n); } void set_default_directory (boost::filesystem::path d) { - _default_directory = d; - changed (); + maybe_set (_default_directory, d); } /** @param p New server port */ void set_server_port_base (int p) { - _server_port_base = p; - changed (); + 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); } /** @param i IP address of a TMS that we can copy DCPs to */ void set_tms_ip (std::string i) { - _tms_ip = i; - changed (); + maybe_set (_tms_ip, i); } /** @param p Path on a TMS that we should changed DCPs to */ void set_tms_path (std::string p) { - _tms_path = p; - changed (); + maybe_set (_tms_path, p); } /** @param u User name to log into the TMS with */ void set_tms_user (std::string u) { - _tms_user = u; - changed (); + maybe_set (_tms_user, u); } /** @param p Password to log into the TMS with */ void set_tms_password (std::string p) { - _tms_password = p; - changed (); + maybe_set (_tms_password, p); } void add_cinema (boost::shared_ptr c) { @@ -281,148 +297,137 @@ public: } void set_allowed_dcp_frame_rates (std::list const & r) { - _allowed_dcp_frame_rates = r; - changed (); + maybe_set (_allowed_dcp_frame_rates, r); } void set_allow_any_dcp_frame_rate (bool a) { - _allow_any_dcp_frame_rate = a; - changed (); + maybe_set (_allow_any_dcp_frame_rate, a); } void set_default_isdcf_metadata (ISDCFMetadata d) { - _default_isdcf_metadata = d; - changed (); + maybe_set (_default_isdcf_metadata, d); } void set_language (std::string l) { + if (_language && _language.get() == l) { + return; + } _language = l; changed (); } void unset_language () { + if (!_language) { + return; + } + _language = boost::none; changed (); } void set_default_still_length (int s) { - _default_still_length = s; - changed (); + maybe_set (_default_still_length, s); } void set_default_container (Ratio const * c) { - _default_container = c; - changed (); + maybe_set (_default_container, c); } void set_default_dcp_content_type (DCPContentType const * t) { - _default_dcp_content_type = t; - changed (); + maybe_set (_default_dcp_content_type, t); } void set_dcp_issuer (std::string i) { - _dcp_issuer = i; - changed (); + maybe_set (_dcp_issuer, i); + } + + void set_dcp_creator (std::string c) { + maybe_set (_dcp_creator, c); } void set_default_j2k_bandwidth (int b) { - _default_j2k_bandwidth = b; - changed (); + maybe_set (_default_j2k_bandwidth, b); } void set_default_audio_delay (int d) { - _default_audio_delay = d; - changed (); + maybe_set (_default_audio_delay, d); } - void set_colour_conversions (std::vector const & c) { - _colour_conversions = c; - changed (); + void set_default_interop (bool i) { + maybe_set (_default_interop, i); } void set_mail_server (std::string s) { - _mail_server = s; - changed (); + maybe_set (_mail_server, s); + } + + void set_mail_port (int p) { + maybe_set (_mail_port, p); } void set_mail_user (std::string u) { - _mail_user = u; - changed (); + maybe_set (_mail_user, u); } void set_mail_password (std::string p) { - _mail_password = p; - changed (); + maybe_set (_mail_password, p); } void set_kdm_subject (std::string s) { - _kdm_subject = s; - changed (); + maybe_set (_kdm_subject, s); } void set_kdm_from (std::string f) { - _kdm_from = f; - changed (); + maybe_set (_kdm_from, f); } void set_kdm_cc (std::string f) { - _kdm_cc = f; - changed (); + maybe_set (_kdm_cc, f); } void set_kdm_bcc (std::string f) { - _kdm_bcc = f; - changed (); + maybe_set (_kdm_bcc, f); } - + void set_kdm_email (std::string e) { - _kdm_email = e; - changed (); + maybe_set (_kdm_email, e); } void reset_kdm_email (); - void set_signer (boost::shared_ptr s) { - _signer = s; - changed (); + void set_signer_chain (boost::shared_ptr s) { + maybe_set (_signer_chain, s); } - void set_decryption_certificate (dcp::Certificate c) { - _decryption_certificate = c; - changed (); - } - - void set_decryption_private_key (std::string k) { - _decryption_private_key = k; - changed (); + void set_decryption_chain (boost::shared_ptr c) { + maybe_set (_decryption_chain, c); } void set_check_for_updates (bool c) { - _check_for_updates = c; - changed (); + maybe_set (_check_for_updates, c); } void set_check_for_test_updates (bool c) { - _check_for_test_updates = c; - changed (); + maybe_set (_check_for_test_updates, c); } void set_maximum_j2k_bandwidth (int b) { - _maximum_j2k_bandwidth = b; - changed (); + maybe_set (_maximum_j2k_bandwidth, b); } void set_log_types (int t) { - _log_types = t; - changed (); + maybe_set (_log_types, t); } -#ifdef DCPOMATIC_WINDOWS + void set_automatic_audio_analysis (bool a) { + maybe_set (_automatic_audio_analysis, a); + } + +#ifdef DCPOMATIC_WINDOWS void set_win32_console (bool c) { - _win32_console = c; - changed (); + maybe_set (_win32_console, c); } -#endif +#endif void clear_history () { _history.clear (); @@ -430,19 +435,32 @@ public: } void add_to_history (boost::filesystem::path p); - - void changed (); - boost::signals2::signal Changed; + + void changed (Property p = OTHER); + boost::signals2::signal Changed; + + void write () const; 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 write () const; - void make_decryption_keys (); + void set_defaults (); + void set_kdm_email_to_default (); + + template + void maybe_set (T& member, T new_value) { + if (member == new_value) { + return; + } + member = new_value; + changed (); + } /** number of threads to use for J2K encoding on the local machine */ int _num_local_encoding_threads; @@ -456,6 +474,8 @@ private: 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; /** The path on a TMS that we should write DCPs to */ @@ -472,15 +492,18 @@ private: /** Default ISDCF metadata for newly-created Films */ ISDCFMetadata _default_isdcf_metadata; boost::optional _language; + /** Default length of still image content (seconds) */ int _default_still_length; 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::vector _colour_conversions; + bool _default_interop; std::list > _cinemas; std::string _mail_server; + int _mail_port; std::string _mail_user; std::string _mail_password; std::string _kdm_subject; @@ -488,20 +511,23 @@ private: std::string _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; -#ifdef DCPOMATIC_WINDOWS + bool _automatic_audio_analysis; +#ifdef DCPOMATIC_WINDOWS bool _win32_console; -#endif +#endif std::vector _history; - + /** Singleton instance, or 0 */ static Config* _instance; };