X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=ee11dcadbefb071cf606a07e9114275a5974c469;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=a59cdcae0df448e61fb03c0e7694162e25a1600d;hpb=5f0f0de782100a5cb558f30c7768c8af0c19bcb7;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index a59cdcae0..ee11dcadb 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 @@ -21,26 +21,30 @@ * @brief Class holding configuration. */ -#ifndef DVDOMATIC_CONFIG_H -#define DVDOMATIC_CONFIG_H +#ifndef DCPOMATIC_CONFIG_H +#define DCPOMATIC_CONFIG_H #include #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,36 +53,43 @@ 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; + changed (); } - Scaler const * reference_scaler () const { - return _reference_scaler; + bool use_any_servers () const { + return _use_any_servers; } - std::vector reference_filters () const { - return _reference_filters; + /** @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 */ + 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 */ + + /** @return The path on a TMS that we should changed DCPs to */ std::string tms_path () const { return _tms_path; } @@ -98,6 +109,10 @@ public: return _sound_processor; } + std::list > cinemas () const { + return _cinemas; + } + std::list allowed_dcp_frame_rates () const { return _allowed_dcp_frame_rates; } @@ -110,115 +125,239 @@ public: return _language; } - Format const * default_format () const { - return _default_format; + int default_still_length () const { + return _default_still_length; + } + + Ratio const * default_container () const { + return _default_container; } DCPContentType const * default_dcp_content_type () const { return _default_dcp_content_type; } - libdcp::XMLMetadata dcp_metadata () const { + dcp::XMLMetadata dcp_metadata () const { return _dcp_metadata; } - /** @param n New number of local encoding threads */ - void set_num_local_encoding_threads (int n) { - _num_local_encoding_threads = n; + int default_j2k_bandwidth () const { + return _default_j2k_bandwidth; } - void set_default_directory (std::string d) { - _default_directory = d; + int default_audio_delay () const { + return _default_audio_delay; } - /** @param p New server port */ - void set_server_port (int p) { - _server_port = p; + std::vector colour_conversions () const { + return _colour_conversions; } - /** @param s New list of servers */ - void set_servers (std::vector s) { - _servers = s; + std::string mail_server () const { + 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; + } + + std::string kdm_email () const { + return _kdm_email; } - void set_reference_scaler (Scaler const * s) { - _reference_scaler = s; + 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; } - 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; + 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; + 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_default_dci_metadata (DCIMetadata d) { _default_dci_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_format (Format const * f) { - _default_format = f; + 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) { + void set_dcp_metadata (dcp::XMLMetadata m) { _dcp_metadata = m; + 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_from (std::string f) { + _kdm_from = f; + changed (); + } + + void set_kdm_email (std::string e) { + _kdm_email = e; + 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 write () const; + boost::filesystem::path signer_chain_directory () const; + + void changed (); + boost::signals2::signal Changed; static Config* instance (); static void drop (); private: Config (); - std::string file () const; + boost::filesystem::path file (bool) const; + void read (); + void read_old_metadata (); + void write () const; /** 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 */ @@ -233,9 +372,24 @@ private: /** Default DCI metadata for newly-created Films */ DCIMetadata _default_dci_metadata; boost::optional _language; - Format const * _default_format; + 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; + /** maximum allowed J2K bandwidth in bits per second */ + int _maximum_j2k_bandwidth; /** Singleton instance, or 0 */ static Config* _instance;