X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=40b65534211439c5a29b19a22a2d417292e57856;hb=99856300c7080f7602507ae6f64b870200710736;hp=b39e7af3ac028c8b1bdd1b418eceaddfccd8e7a0;hpb=5229b795b9d7cafe174496fbc6bca8d62f4a3ff0;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index b39e7af3a..40b655342 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 @@ -27,8 +27,8 @@ #include "isdcf_metadata.h" #include "video_content.h" #include -#include -#include +#include +#include #include #include #include @@ -59,6 +59,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; @@ -66,7 +72,7 @@ public: void set_use_any_servers (bool u) { _use_any_servers = u; - changed (); + changed (USE_ANY_SERVERS); } bool use_any_servers () const { @@ -76,7 +82,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 */ @@ -84,11 +90,15 @@ public: return _servers; } + 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; @@ -112,7 +122,7 @@ public: std::list > cinemas () const { return _cinemas; } - + std::list allowed_dcp_frame_rates () const { return _allowed_dcp_frame_rates; } @@ -120,7 +130,7 @@ public: bool allow_any_dcp_frame_rate () const { return _allow_any_dcp_frame_rate; } - + ISDCFMetadata default_isdcf_metadata () const { return _default_isdcf_metadata; } @@ -145,6 +155,10 @@ public: return _dcp_issuer; } + std::string dcp_creator () const { + return _dcp_creator; + } + int default_j2k_bandwidth () const { return _default_j2k_bandwidth; } @@ -157,6 +171,10 @@ public: return _mail_server; } + int mail_port () const { + return _mail_port; + } + std::string mail_user () const { return _mail_user; } @@ -180,21 +198,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 { @@ -213,11 +227,11 @@ public: return _log_types; } -#ifdef DCPOMATIC_WINDOWS +#ifdef DCPOMATIC_WINDOWS bool win32_console () const { return _win32_console; } -#endif +#endif std::vector history () const { return _history; @@ -237,6 +251,10 @@ public: maybe_set (_server_port_base, p); } + 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); @@ -291,7 +309,7 @@ public: if (!_language) { return; } - + _language = boost::none; changed (); } @@ -312,6 +330,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); } @@ -324,6 +346,10 @@ public: 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); } @@ -347,23 +373,19 @@ public: 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_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) { @@ -382,11 +404,11 @@ public: maybe_set (_log_types, t); } -#ifdef DCPOMATIC_WINDOWS +#ifdef DCPOMATIC_WINDOWS void set_win32_console (bool c) { maybe_set (_win32_console, c); } -#endif +#endif void clear_history () { _history.clear (); @@ -394,21 +416,21 @@ 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 (); void read (); - void make_decryption_keys (); void set_defaults (); void set_kdm_email_to_default (); @@ -433,6 +455,7 @@ private: bool _use_any_servers; /** J2K encoding servers that should definitely be used */ std::vector _servers; + 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 */ @@ -449,14 +472,17 @@ 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::list > _cinemas; std::string _mail_server; + int _mail_port; std::string _mail_user; std::string _mail_password; std::string _kdm_subject; @@ -464,20 +490,22 @@ 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 +#ifdef DCPOMATIC_WINDOWS bool _win32_console; -#endif +#endif std::vector _history; - + /** Singleton instance, or 0 */ static Config* _instance; };