X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=68aae7414a009206f5984a46630f7a5b3c56895c;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=0dcfd3f58b9593e420661652928e7885de3cd765;hpb=7125d8ec2217ae874ce452602465f630f674e786;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 0dcfd3f58..68aae7414 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -28,10 +28,12 @@ #include #include #include -#include +#include #include "dci_metadata.h" #include "colour_conversion.h" +#include "server.h" +class ServerDescription; class Scaler; class Filter; class SoundProcessor; @@ -62,11 +64,31 @@ public: return _server_port_base; } + void set_use_any_servers (bool u) { + _use_any_servers = u; + write (); + } + + bool use_any_servers () const { + return _use_any_servers; + } + + /** @param s New list of servers */ + void set_servers (std::vector s) { + _servers = s; + write (); + } + + /** @return Host names / IP addresses of J2K encoding servers that should definitely be used */ + std::vector servers () const { + return _servers; + } + /** @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 write DCPs to */ std::string tms_path () const { return _tms_path; @@ -115,7 +137,7 @@ public: return _default_dcp_content_type; } - libdcp::XMLMetadata dcp_metadata () const { + dcp::XMLMetadata dcp_metadata () const { return _dcp_metadata; } @@ -123,6 +145,10 @@ public: return _default_j2k_bandwidth; } + int default_audio_delay () const { + return _default_audio_delay; + } + std::vector colour_conversions () const { return _colour_conversions; } @@ -131,6 +157,14 @@ public: return _mail_server; } + std::string mail_user () const { + return _mail_user; + } + + std::string mail_password () const { + return _mail_password; + } + std::string kdm_from () const { return _kdm_from; } @@ -139,46 +173,53 @@ public: return _kdm_email; } + bool check_for_updates () const { + return _check_for_updates; + } + + bool check_for_test_updates () const { + return _check_for_test_updates; + } + /** @param n New number of local encoding threads */ void set_num_local_encoding_threads (int n) { _num_local_encoding_threads = n; + write (); } void set_default_directory (boost::filesystem::path d) { _default_directory = d; + write (); } /** @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; + write (); } /** @param i IP address of a TMS that we can copy DCPs to */ void set_tms_ip (std::string i) { _tms_ip = i; + write (); } /** @param p Path on a TMS that we should write DCPs to */ void set_tms_path (std::string p) { _tms_path = p; + write (); } /** @param u User name to log into the TMS with */ void set_tms_user (std::string u) { _tms_user = u; + write (); } /** @param p Password to log into the TMS with */ void set_tms_password (std::string p) { _tms_password = p; + write (); } void add_cinema (boost::shared_ptr c) { @@ -191,54 +232,92 @@ public: void set_allowed_dcp_frame_rates (std::list const & r) { _allowed_dcp_frame_rates = r; + write (); } void set_default_dci_metadata (DCIMetadata d) { _default_dci_metadata = d; + write (); } void set_language (std::string l) { _language = l; + write (); } void unset_language () { _language = boost::none; + write (); } void set_default_still_length (int s) { _default_still_length = s; + write (); } void set_default_container (Ratio const * c) { _default_container = c; + write (); } void set_default_dcp_content_type (DCPContentType const * t) { _default_dcp_content_type = t; + write (); } - void set_dcp_metadata (libdcp::XMLMetadata m) { + void set_dcp_metadata (dcp::XMLMetadata m) { _dcp_metadata = m; + write (); } void set_default_j2k_bandwidth (int b) { _default_j2k_bandwidth = b; + write (); + } + + void set_default_audio_delay (int d) { + _default_audio_delay = d; + write (); } void set_colour_conversions (std::vector const & c) { _colour_conversions = c; + write (); } void set_mail_server (std::string s) { _mail_server = s; + write (); + } + + void set_mail_user (std::string u) { + _mail_user = u; + write (); + } + + void set_mail_password (std::string p) { + _mail_password = p; + write (); } void set_kdm_from (std::string f) { _kdm_from = f; + write (); } void set_kdm_email (std::string e) { _kdm_email = e; + write (); + } + + void set_check_for_updates (bool c) { + _check_for_updates = c; + write (); + } + + void set_check_for_test_updates (bool c) { + _check_for_test_updates = c; + write (); } void write () const; @@ -262,10 +341,10 @@ private: * this port and the one above it will be used. */ int _server_port_base; - /** 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; + /** 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; /** 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 */ @@ -283,13 +362,19 @@ private: int _default_still_length; Ratio const * _default_container; DCPContentType const * _default_dcp_content_type; - libdcp::XMLMetadata _dcp_metadata; + dcp::XMLMetadata _dcp_metadata; 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_from; std::string _kdm_email; + /** true to check for updates on startup */ + bool _check_for_updates; + bool _check_for_test_updates; /** Singleton instance, or 0 */ static Config* _instance;