X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=3e8a975d6fcb4330c90edafda325168f8648717e;hb=1ba7bca7f2950faa441ec83920d35b65016f3fa6;hp=5113236d652fabdb0e989c3effd6fdbf81599ae1;hpb=3e915b00219ee8c97e50bbc775d90d0dddce87b6;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 5113236d6..3e8a975d6 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -21,22 +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 "dci_metadata.h" +#include "colour_conversion.h" +#include "server.h" class ServerDescription; class Scaler; class Filter; class SoundProcessor; +class DCPContentType; +class Ratio; +class Cinema; /** @class Config * @brief A singleton class holding configuration. */ -class Config +class Config : public boost::noncopyable { public: @@ -45,43 +53,22 @@ 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 index of colour LUT to use when converting RGB to XYZ. - * 0: sRGB - * 1: Rec 709 - */ - int colour_lut_index () const { - return _colour_lut_index; - } - - /** @return bandwidth for J2K files in bits per second */ - int j2k_bandwidth () const { - return _j2k_bandwidth; - } - /** @return J2K encoding servers to use */ - std::vector servers () const { + std::vector servers () const { return _servers; } - Scaler const * reference_scaler () const { - return _reference_scaler; - } - - std::vector reference_filters () const { - return _reference_filters; - } - /** @return The IP address of a TMS that we can copy DCPs to */ std::string tms_ip () const { return _tms_ip; @@ -102,16 +89,57 @@ public: return _tms_password; } + /** @return The sound processor that we are using */ SoundProcessor const * sound_processor () const { return _sound_processor; } + std::list > cinemas () const { + return _cinemas; + } + + std::list allowed_dcp_frame_rates () const { + return _allowed_dcp_frame_rates; + } + + DCIMetadata default_dci_metadata () const { + return _default_dci_metadata; + } + + boost::optional language () const { + return _language; + } + + 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 { + return _dcp_metadata; + } + + int default_j2k_bandwidth () const { + return _default_j2k_bandwidth; + } + + 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; } - void set_default_directory (std::string d) { + void set_default_directory (boost::filesystem::path d) { _default_directory = d; } @@ -120,18 +148,8 @@ public: _server_port = p; } - /** @param i New colour LUT index */ - void set_colour_lut_index (int i) { - _colour_lut_index = i; - } - - /** @param b New J2K bandwidth */ - void set_j2k_bandwidth (int b) { - _j2k_bandwidth = b; - } - /** @param s New list of servers */ - void set_servers (std::vector s) { + void set_servers (std::vector s) { _servers = s; } @@ -162,30 +180,77 @@ public: void set_tms_password (std::string p) { _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; + } + + void set_default_dci_metadata (DCIMetadata d) { + _default_dci_metadata = d; + } + + void set_language (std::string l) { + _language = l; + } + + void unset_language () { + _language = boost::none; + } + + void set_default_still_length (int s) { + _default_still_length = s; + } + + void set_default_container (Ratio const * c) { + _default_container = c; + } + + void set_default_dcp_content_type (DCPContentType const * t) { + _default_dcp_content_type = t; + } + + 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 write () const; + boost::filesystem::path signer_chain_directory () const; + static Config* instance (); + static void drop (); private: Config (); - std::string file () 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; + boost::filesystem::path _default_directory; /** port to use for J2K encoding servers */ int _server_port; - /** index of colour LUT to use when converting RGB to XYZ - * (see colour_lut_index ()) - */ - int _colour_lut_index; - /** bandwidth for J2K files in bits per second */ - int _j2k_bandwidth; /** J2K encoding servers to use */ - std::vector _servers; + 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 */ @@ -200,6 +265,17 @@ private: std::string _tms_password; /** Our sound processor */ SoundProcessor const * _sound_processor; + std::list _allowed_dcp_frame_rates; + /** Default DCI metadata for newly-created Films */ + DCIMetadata _default_dci_metadata; + boost::optional _language; + int _default_still_length; + 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; /** Singleton instance, or 0 */ static Config* _instance;