X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=1fa54f669bd83130fa8502faf3c9789e9a5a8285;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=96aa4e44969d730d1490263b8c094b32d8370dbc;hpb=9fa643bdebdcb39cca4b529f13fdd0fbfd721d58;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 96aa4e449..1fa54f669 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -27,20 +27,24 @@ #include #include #include +#include #include #include "dci_metadata.h" +#include "colour_conversion.h" +#include "server.h" class ServerDescription; class Scaler; class Filter; class SoundProcessor; -class Format; class DCPContentType; +class Ratio; +class Cinema; /** @class Config * @brief A singleton class holding configuration. */ -class Config +class Config : public boost::noncopyable { public: @@ -49,35 +53,40 @@ 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 { - return _servers; + void set_use_any_servers (bool u) { + _use_any_servers = u; + } + + bool use_any_servers () const { + return _use_any_servers; } - Scaler const * reference_scaler () const { - return _reference_scaler; + /** @param s New list of servers */ + void set_servers (std::vector s) { + _servers = s; } - std::vector reference_filters () const { - return _reference_filters; + /** @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; @@ -98,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; } @@ -114,8 +127,8 @@ public: return _default_still_length; } - Format const * default_format () const { - return _default_format; + Ratio const * default_container () const { + return _default_container; } DCPContentType const * default_dcp_content_type () const { @@ -126,23 +139,38 @@ public: return _dcp_metadata; } + int default_j2k_bandwidth () const { + return _default_j2k_bandwidth; + } + + std::vector colour_conversions () const { + return _colour_conversions; + } + + std::string mail_server () const { + return _mail_server; + } + + std::string kdm_from () const { + return _kdm_from; + } + + std::string kdm_email () const { + return _kdm_email; + } + /** @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 (std::string d) { + void set_default_directory (boost::filesystem::path d) { _default_directory = d; } /** @param p New server port */ - void set_server_port (int p) { - _server_port = p; - } - - /** @param s New list of servers */ - void set_servers (std::vector s) { - _servers = s; + void set_server_port_base (int p) { + _server_port_base = p; } void set_reference_scaler (Scaler const * s) { @@ -173,6 +201,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; } @@ -193,8 +229,8 @@ public: _default_still_length = s; } - void set_default_format (Format const * f) { - _default_format = f; + void set_default_container (Ratio const * c) { + _default_container = c; } void set_default_dcp_content_type (DCPContentType const * t) { @@ -204,27 +240,52 @@ public: void set_dcp_metadata (libdcp::XMLMetadata m) { _dcp_metadata = m; } + + void set_default_j2k_bandwidth (int b) { + _default_j2k_bandwidth = b; + } + + void set_colour_conversions (std::vector const & c) { + _colour_conversions = c; + } + + void set_mail_server (std::string s) { + _mail_server = s; + } + + void set_kdm_from (std::string f) { + _kdm_from = f; + } + + void set_kdm_email (std::string e) { + _kdm_email = e; + } 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; + 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; /** 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 */ @@ -244,9 +305,15 @@ private: DCIMetadata _default_dci_metadata; boost::optional _language; int _default_still_length; - Format const * _default_format; + Ratio const * _default_container; DCPContentType const * _default_dcp_content_type; libdcp::XMLMetadata _dcp_metadata; + int _default_j2k_bandwidth; + std::vector _colour_conversions; + std::list > _cinemas; + std::string _mail_server; + std::string _kdm_from; + std::string _kdm_email; /** Singleton instance, or 0 */ static Config* _instance;