X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=99b3eb62122e00529502db5100f5e069a35c4c3e;hb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;hp=1fa54f669bd83130fa8502faf3c9789e9a5a8285;hpb=d99ca0a95e61b53105f765497bc465a7420e7a47;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 1fa54f669..99b3eb621 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 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 @@ -28,15 +28,17 @@ #include #include #include -#include -#include "dci_metadata.h" +#include +#include +#include +#include "isdcf_metadata.h" #include "colour_conversion.h" -#include "server.h" +#include "video_content.h" class ServerDescription; class Scaler; class Filter; -class SoundProcessor; +class CinemaSoundProcessor; class DCPContentType; class Ratio; class Cinema; @@ -66,6 +68,7 @@ public: void set_use_any_servers (bool u) { _use_any_servers = u; + changed (); } bool use_any_servers () const { @@ -75,6 +78,7 @@ public: /** @param s New list of servers */ void set_servers (std::vector s) { _servers = s; + changed (); } /** @return Host names / IP addresses of J2K encoding servers that should definitely be used */ @@ -87,7 +91,7 @@ public: return _tms_ip; } - /** @return The path on a TMS that we should write DCPs to */ + /** @return The path on a TMS that we should changed DCPs to */ std::string tms_path () const { return _tms_path; } @@ -102,9 +106,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 { @@ -114,9 +118,13 @@ public: std::list allowed_dcp_frame_rates () const { return _allowed_dcp_frame_rates; } + + bool allow_any_dcp_frame_rate () const { + return _allow_any_dcp_frame_rate; + } - DCIMetadata default_dci_metadata () const { - return _default_dci_metadata; + ISDCFMetadata default_isdcf_metadata () const { + return _default_isdcf_metadata; } boost::optional language () const { @@ -127,6 +135,10 @@ public: return _default_still_length; } + VideoContentScale default_scale () const { + return _default_scale; + } + Ratio const * default_container () const { return _default_container; } @@ -135,14 +147,18 @@ 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 { return _default_j2k_bandwidth; } + int default_audio_delay () const { + return _default_audio_delay; + } + std::vector colour_conversions () const { return _colour_conversions; } @@ -151,119 +167,268 @@ public: return _mail_server; } + std::string mail_user () const { + return _mail_user; + } + + std::string mail_password () const { + return _mail_password; + } + + std::string kdm_subject () const { + return _kdm_subject; + } + std::string kdm_from () const { return _kdm_from; } + std::string 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; + } + + std::string decryption_private_key () const { + return _decryption_private_key; + } + + bool check_for_updates () const { + return _check_for_updates; + } + + bool check_for_test_updates () const { + return _check_for_test_updates; + } + + int maximum_j2k_bandwidth () const { + return _maximum_j2k_bandwidth; + } + + int log_types () const { + return _log_types; + } + + 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 (); } void set_default_directory (boost::filesystem::path d) { _default_directory = d; + changed (); } /** @param p New server port */ void set_server_port_base (int p) { _server_port_base = p; - } - - void set_reference_scaler (Scaler const * s) { - _reference_scaler = s; - } - - void set_reference_filters (std::vector const & f) { - _reference_filters = f; + changed (); } /** @param i IP address of a TMS that we can copy DCPs to */ void set_tms_ip (std::string i) { _tms_ip = i; + changed (); } - /** @param p Path on a TMS that we should write DCPs to */ + /** @param p Path on a TMS that we should changed DCPs to */ void set_tms_path (std::string p) { _tms_path = p; + changed (); } /** @param u User name to log into the TMS with */ void set_tms_user (std::string u) { _tms_user = u; + changed (); } /** @param p Password to log into the TMS with */ void set_tms_password (std::string p) { _tms_password = p; + changed (); } void add_cinema (boost::shared_ptr c) { _cinemas.push_back (c); + changed (); } void remove_cinema (boost::shared_ptr c) { _cinemas.remove (c); + changed (); } void set_allowed_dcp_frame_rates (std::list const & r) { _allowed_dcp_frame_rates = r; + changed (); + } + + void set_allow_any_dcp_frame_rate (bool a) { + _allow_any_dcp_frame_rate = a; + changed (); } - void set_default_dci_metadata (DCIMetadata d) { - _default_dci_metadata = d; + void set_default_isdcf_metadata (ISDCFMetadata d) { + _default_isdcf_metadata = d; + changed (); } void set_language (std::string l) { _language = l; + changed (); } void unset_language () { _language = boost::none; + changed (); } void set_default_still_length (int s) { _default_still_length = s; + changed (); + } + + void set_default_scale (VideoContentScale s) { + _default_scale = s; + changed (); } void set_default_container (Ratio const * c) { _default_container = c; + changed (); } void set_default_dcp_content_type (DCPContentType const * t) { _default_dcp_content_type = t; + changed (); } - void set_dcp_metadata (libdcp::XMLMetadata m) { - _dcp_metadata = m; + void set_dcp_issuer (std::string i) { + _dcp_issuer = i; + changed (); } void set_default_j2k_bandwidth (int b) { _default_j2k_bandwidth = b; + changed (); + } + + void set_default_audio_delay (int d) { + _default_audio_delay = d; + changed (); } void set_colour_conversions (std::vector const & c) { _colour_conversions = c; + changed (); } void set_mail_server (std::string s) { _mail_server = s; + changed (); + } + + void set_mail_user (std::string u) { + _mail_user = u; + changed (); + } + + void set_mail_password (std::string p) { + _mail_password = p; + changed (); + } + + void set_kdm_subject (std::string s) { + _kdm_subject = s; + changed (); } void set_kdm_from (std::string f) { _kdm_from = f; + changed (); } + void set_kdm_cc (std::string f) { + _kdm_cc = f; + changed (); + } + + void set_kdm_bcc (std::string f) { + _kdm_bcc = f; + changed (); + } + void set_kdm_email (std::string e) { _kdm_email = e; + changed (); } - - void write () const; - boost::filesystem::path signer_chain_directory () const; + void reset_kdm_email (); + + void set_signer (boost::shared_ptr s) { + _signer = s; + changed (); + } + + 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_check_for_updates (bool c) { + _check_for_updates = c; + changed (); + } + + void set_check_for_test_updates (bool c) { + _check_for_test_updates = c; + changed (); + } + + void set_maximum_j2k_bandwidth (int b) { + _maximum_j2k_bandwidth = b; + changed (); + } + + void set_log_types (int t) { + _log_types = t; + changed (); + } + + void clear_history () { + _history.clear (); + changed (); + } + + void add_to_history (boost::filesystem::path p); + + void changed (); + boost::signals2::signal Changed; static Config* instance (); static void drop (); @@ -272,7 +437,8 @@ private: Config (); boost::filesystem::path file (bool) const; void read (); - void read_old_metadata (); + void write () const; + void make_decryption_keys (); /** number of threads to use for J2K encoding on the local machine */ int _num_local_encoding_threads; @@ -286,10 +452,6 @@ private: bool _use_any_servers; /** J2K encoding servers that should definitely be used */ std::vector _servers; - /** Scaler to use for the "A" part of A/B comparisons */ - Scaler const * _reference_scaler; - /** Filters to use for the "A" part of A/B comparisons */ - std::vector _reference_filters; /** 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 */ @@ -298,23 +460,42 @@ 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; - /** Default DCI metadata for newly-created Films */ - DCIMetadata _default_dci_metadata; + /** 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; int _default_still_length; + VideoContentScale _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; + std::string _mail_password; + std::string _kdm_subject; std::string _kdm_from; + 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; + std::vector _history; + /** Singleton instance, or 0 */ static Config* _instance; };