X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=20529911b605ba363b4117454c9759a773a5dade;hb=387304bc9147933b68eda2b38ba8cac0d250e87e;hp=0ce6b8351a4b0a48d5fb3a0791112edd5edd2ba1;hpb=38ec06fc927bff26ed78e45358d847ebb4e484de;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 0ce6b8351..20529911b 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -24,19 +24,20 @@ #ifndef DCPOMATIC_CONFIG_H #define DCPOMATIC_CONFIG_H -#include +#include "isdcf_metadata.h" +#include "video_content.h" +#include +#include +#include #include #include #include -#include -#include "isdcf_metadata.h" -#include "colour_conversion.h" -#include "server.h" +#include class ServerDescription; class Scaler; class Filter; -class SoundProcessor; +class CinemaSoundProcessor; class DCPContentType; class Ratio; class Cinema; @@ -47,7 +48,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; @@ -104,9 +104,9 @@ public: return _tms_password; } - /** @return The sound processor that we are using */ - SoundProcessor const * sound_processor () const { - return _sound_processor; + /** @return The cinema sound processor that we are using */ + CinemaSoundProcessor const * cinema_sound_processor () const { + return _cinema_sound_processor; } std::list > cinemas () const { @@ -133,10 +133,6 @@ public: return _default_still_length; } - Ratio const * default_scale () const { - return _default_scale; - } - Ratio const * default_container () const { return _default_container; } @@ -145,8 +141,8 @@ public: return _default_dcp_content_type; } - libdcp::XMLMetadata dcp_metadata () const { - return _dcp_metadata; + std::string dcp_issuer () const { + return _dcp_issuer; } int default_j2k_bandwidth () const { @@ -157,10 +153,6 @@ public: return _default_audio_delay; } - std::vector colour_conversions () const { - return _colour_conversions; - } - std::string mail_server () const { return _mail_server; } @@ -193,6 +185,18 @@ public: return _kdm_email; } + boost::shared_ptr signer () const { + return _signer; + } + + dcp::Certificate decryption_certificate () const { + return _decryption_certificate; + } + + std::string decryption_private_key () const { + return _decryption_private_key; + } + bool check_for_updates () const { return _check_for_updates; } @@ -208,46 +212,49 @@ public: int log_types () const { return _log_types; } - + +#ifdef DCPOMATIC_WINDOWS + bool win32_console () const { + return _win32_console; + } +#endif + + std::vector history () const { + return _history; + } + /** @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); } /** @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) { @@ -261,146 +268,158 @@ 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 (); - } - - void set_default_scale (Ratio const * s) { - _default_scale = 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_metadata (libdcp::XMLMetadata m) { - _dcp_metadata = m; - changed (); + void set_dcp_issuer (std::string i) { + maybe_set (_dcp_issuer, i); } 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 (); - } - - void set_colour_conversions (std::vector const & c) { - _colour_conversions = c; - changed (); + maybe_set (_default_audio_delay, d); } void set_mail_server (std::string s) { - _mail_server = s; - changed (); + maybe_set (_mail_server, s); } 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) { + maybe_set (_signer, 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_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; + maybe_set (_log_types, t); + } + +#ifdef DCPOMATIC_WINDOWS + void set_win32_console (bool c) { + maybe_set (_win32_console, c); + } +#endif + + void clear_history () { + _history.clear (); changed (); } - - boost::filesystem::path signer_chain_directory () const; + void add_to_history (boost::filesystem::path p); + void changed (); boost::signals2::signal Changed; + void write () const; + static Config* instance (); static void drop (); + static void restore_defaults (); private: Config (); - boost::filesystem::path file (bool) const; + boost::filesystem::path file () const; void read (); - void read_old_metadata (); - 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; @@ -422,22 +441,21 @@ private: std::string _tms_user; /** Password to log into the TMS with */ std::string _tms_password; - /** Our sound processor */ - SoundProcessor const * _sound_processor; + /** Our cinema sound processor */ + CinemaSoundProcessor const * _cinema_sound_processor; std::list _allowed_dcp_frame_rates; /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */ bool _allow_any_dcp_frame_rate; /** 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_scale; Ratio const * _default_container; DCPContentType const * _default_dcp_content_type; - libdcp::XMLMetadata _dcp_metadata; + std::string _dcp_issuer; int _default_j2k_bandwidth; int _default_audio_delay; - std::vector _colour_conversions; std::list > _cinemas; std::string _mail_server; std::string _mail_user; @@ -447,13 +465,20 @@ 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; /** 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 _win32_console; +#endif + std::vector _history; + /** Singleton instance, or 0 */ static Config* _instance; };