X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=14cd640eeeefb2a042086dd600b447626103f044;hb=a983bc3abceadae75c7fa070ae394a69e6d8bd5b;hp=40d06a1721493ab8105b13109c881ec37fd3b19c;hpb=74a8d26a8907c6e00e29f054178a3425f44e38ed;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 40d06a172..14cd640ee 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -27,8 +27,11 @@ #include #include #include -#include +#include +#include #include "dci_metadata.h" +#include "colour_conversion.h" +#include "server.h" class ServerDescription; class Scaler; @@ -36,7 +39,7 @@ class Filter; class SoundProcessor; class DCPContentType; class Ratio; -class ColourConversion; +class Cinema; /** @class Config * @brief A singleton class holding configuration. @@ -50,19 +53,32 @@ public: return _num_local_encoding_threads; } - std::string default_directory () const { + boost::filesystem::path default_directory () const { return _default_directory; } - std::string default_directory_or (std::string a) const; + boost::filesystem::path default_directory_or (boost::filesystem::path a) const; - /** @return port to use for J2K encoding servers */ - int server_port () const { - return _server_port; + /** @return base port number to use for J2K encoding servers */ + int server_port_base () const { + return _server_port_base; } - /** @return J2K encoding servers to use */ - std::vector > servers () const { + void set_use_any_servers (bool u) { + _use_any_servers = u; + } + + bool use_any_servers () const { + return _use_any_servers; + } + + /** @param s New list of servers */ + void set_servers (std::vector s) { + _servers = s; + } + + /** @return Host names / IP addresses of J2K encoding servers that should definitely be used */ + std::vector servers () const { return _servers; } @@ -70,7 +86,7 @@ public: 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; @@ -91,6 +107,10 @@ public: return _sound_processor; } + std::list > cinemas () const { + return _cinemas; + } + std::list allowed_dcp_frame_rates () const { return _allowed_dcp_frame_rates; } @@ -115,7 +135,7 @@ public: return _default_dcp_content_type; } - libdcp::XMLMetadata dcp_metadata () const { + dcp::XMLMetadata dcp_metadata () const { return _dcp_metadata; } @@ -123,35 +143,54 @@ public: return _default_j2k_bandwidth; } - std::vector > colour_conversions () const { + int default_audio_delay () const { + return _default_audio_delay; + } + + std::vector colour_conversions () const { return _colour_conversions; } - /** @param n New number of local encoding threads */ - void set_num_local_encoding_threads (int n) { - _num_local_encoding_threads = n; + std::string mail_server () const { + return _mail_server; } - void set_default_directory (std::string d) { - _default_directory = d; + std::string mail_user () const { + return _mail_user; } - /** @param p New server port */ - void set_server_port (int p) { - _server_port = p; + std::string mail_password () const { + return _mail_password; } - /** @param s New list of servers */ - void set_servers (std::vector > s) { - _servers = s; + std::string kdm_from () const { + return _kdm_from; } - void set_reference_scaler (Scaler const * s) { - _reference_scaler = s; + std::string kdm_email () const { + return _kdm_email; + } + + bool check_for_updates () const { + return _check_for_updates; + } + + bool check_for_test_updates () const { + return _check_for_test_updates; } - void set_reference_filters (std::vector const & f) { - _reference_filters = f; + /** @param n New number of local encoding threads */ + void set_num_local_encoding_threads (int n) { + _num_local_encoding_threads = n; + } + + void set_default_directory (boost::filesystem::path d) { + _default_directory = d; + } + + /** @param p New server port */ + void set_server_port_base (int p) { + _server_port_base = p; } /** @param i IP address of a TMS that we can copy DCPs to */ @@ -174,6 +213,14 @@ public: _tms_password = p; } + void add_cinema (boost::shared_ptr c) { + _cinemas.push_back (c); + } + + void remove_cinema (boost::shared_ptr c) { + _cinemas.remove (c); + } + void set_allowed_dcp_frame_rates (std::list const & r) { _allowed_dcp_frame_rates = r; } @@ -202,7 +249,7 @@ public: _default_dcp_content_type = t; } - void set_dcp_metadata (libdcp::XMLMetadata m) { + void set_dcp_metadata (dcp::XMLMetadata m) { _dcp_metadata = m; } @@ -210,34 +257,67 @@ public: _default_j2k_bandwidth = b; } - void set_colour_conversions (std::vector > const & c) { + void set_default_audio_delay (int d) { + _default_audio_delay = d; + } + + void set_colour_conversions (std::vector const & c) { _colour_conversions = c; } + + void set_mail_server (std::string s) { + _mail_server = s; + } + + void set_mail_user (std::string u) { + _mail_user = u; + } + + void set_mail_password (std::string p) { + _mail_password = p; + } + + void set_kdm_from (std::string f) { + _kdm_from = f; + } + + void set_kdm_email (std::string e) { + _kdm_email = e; + } + + void set_check_for_updates (bool c) { + _check_for_updates = c; + } + + void set_check_for_test_updates (bool c) { + _check_for_test_updates = c; + } void write () const; + boost::filesystem::path signer_chain_directory () const; + static Config* instance (); static void drop (); private: Config (); - std::string file (bool) const; + boost::filesystem::path file (bool) const; void read (); void read_old_metadata (); /** number of threads to use for J2K encoding on the local machine */ int _num_local_encoding_threads; /** default directory to put new films in */ - std::string _default_directory; - /** port to use for J2K encoding servers */ - int _server_port; - - /** J2K encoding servers to use */ - 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; + boost::filesystem::path _default_directory; + /** base port number to use for J2K encoding servers; + * this port and the one 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; /** 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 */ @@ -255,9 +335,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; - std::vector > _colour_conversions; + 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;