X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=61c6bfa69f8fa1eb3d980244d8c63cdab25c3c56;hp=4f47ab3142be13a3b19aa6c8116b64a21a9187d2;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=fcfaa5e1de1e166508793d71ed53edcb145656da diff --git a/src/lib/config.h b/src/lib/config.h index 4f47ab314..61c6bfa69 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -25,19 +26,14 @@ #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 #include -class ServerDescription; -class Scaler; -class Filter; class CinemaSoundProcessor; class DCPContentType; class Ratio; @@ -60,6 +56,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; @@ -67,7 +69,7 @@ public: void set_use_any_servers (bool u) { _use_any_servers = u; - changed (); + changed (USE_ANY_SERVERS); } bool use_any_servers () const { @@ -77,7 +79,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 */ @@ -85,11 +87,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; @@ -113,7 +123,7 @@ public: std::list > cinemas () const { return _cinemas; } - + std::list allowed_dcp_frame_rates () const { return _allowed_dcp_frame_rates; } @@ -121,7 +131,7 @@ public: bool allow_any_dcp_frame_rate () const { return _allow_any_dcp_frame_rate; } - + ISDCFMetadata default_isdcf_metadata () const { return _default_isdcf_metadata; } @@ -142,10 +152,18 @@ public: return _default_dcp_content_type; } + int default_dcp_audio_channels () const { + return _default_dcp_audio_channels; + } + std::string dcp_issuer () const { return _dcp_issuer; } + std::string dcp_creator () const { + return _dcp_creator; + } + int default_j2k_bandwidth () const { return _default_j2k_bandwidth; } @@ -154,14 +172,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; } @@ -178,28 +200,24 @@ public: return _kdm_from; } - std::string kdm_cc () const { + std::vector kdm_cc () const { return _kdm_cc; } 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 { @@ -218,16 +236,36 @@ public: return _log_types; } -#ifdef DCPOMATIC_WINDOWS + 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; } -#endif +#endif std::vector history () const { return _history; } + std::vector dkdms () const { + return _dkdms; + } + + boost::filesystem::path cinemas_file () const { + return _cinemas_file; + } + + bool show_hints_before_make_dcp () const { + return _show_hints_before_make_dcp; + } + /** @param n New number of local encoding threads */ void set_num_local_encoding_threads (int n) { maybe_set (_num_local_encoding_threads, n); @@ -242,6 +280,14 @@ 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); + } + /** @param i IP address of a TMS that we can copy DCPs to */ void set_tms_ip (std::string i) { maybe_set (_tms_ip, i); @@ -296,7 +342,7 @@ public: if (!_language) { return; } - + _language = boost::none; changed (); } @@ -313,10 +359,18 @@ public: maybe_set (_default_dcp_content_type, t); } + void set_default_dcp_audio_channels (int c) { + maybe_set (_default_dcp_audio_channels, c); + } + void set_dcp_issuer (std::string i) { 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); } @@ -325,14 +379,18 @@ public: maybe_set (_default_audio_delay, d); } - void set_colour_conversions (std::vector const & c) { - maybe_set (_colour_conversions, c); + void set_default_interop (bool i) { + maybe_set (_default_interop, i); } void set_mail_server (std::string s) { maybe_set (_mail_server, s); } + void set_mail_port (int p) { + maybe_set (_mail_port, p); + } + void set_mail_user (std::string u) { maybe_set (_mail_user, u); } @@ -349,34 +407,33 @@ 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); } void set_kdm_bcc (std::string f) { maybe_set (_kdm_bcc, f); } - + void set_kdm_email (std::string e) { maybe_set (_kdm_email, e); } void reset_kdm_email (); - void set_signer (boost::shared_ptr s) { - maybe_set (_signer, s); - } - - void set_decryption_certificate (dcp::Certificate c) { - maybe_set (_decryption_certificate, c); + void set_signer_chain (boost::shared_ptr s) { + maybe_set (_signer_chain, s); } - 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) { @@ -391,11 +448,31 @@ public: maybe_set (_log_types, t); } -#ifdef DCPOMATIC_WINDOWS + 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 +#endif + + void set_dkdms (std::vector dkdms) + { + _dkdms = dkdms; + changed (); + } + + void set_cinemas_file (boost::filesystem::path file); + + void set_show_hints_before_make_dcp (bool s) { + maybe_set (_show_hints_before_make_dcp, s); + } void clear_history () { _history.clear (); @@ -403,22 +480,31 @@ public: } void add_to_history (boost::filesystem::path p); - - void changed (); - boost::signals2::signal Changed; + + void changed (Property p = OTHER); + boost::signals2::signal Changed; + /** Emitted if ::read() failed on an existing Config file. There is nothing + a listener can do about it: this is just for information. + */ + static boost::signals2::signal FailedToLoad; + + void write () const; 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 write () const; - 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) { @@ -434,13 +520,15 @@ 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; /** The path on a TMS that we should write DCPs to */ @@ -457,36 +545,47 @@ 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; + int _default_dcp_audio_channels; 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; 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; -#ifdef DCPOMATIC_WINDOWS + bool _analyse_ebur128; + bool _automatic_audio_analysis; +#ifdef DCPOMATIC_WINDOWS bool _win32_console; -#endif +#endif std::vector _history; - + std::vector _dkdms; + boost::filesystem::path _cinemas_file; + bool _show_hints_before_make_dcp; + /** Singleton instance, or 0 */ static Config* _instance; };