X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=38664f093f33d79235c7cdb333ac8333d5196afe;hb=e16c8ed02a0cb1f733a990d75a9de1bf50cf89bd;hp=59af8a07ab7164173708adb53ac27114e4f68aab;hpb=b002ffea0b98dd41ba4806d42d0244554e412ee7;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 59af8a07a..38664f093 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -21,18 +21,21 @@ * @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 "dci_metadata.h" class ServerDescription; -class Screen; class Scaler; class Filter; class SoundProcessor; +class DCPContentType; +class Ratio; /** @class Config * @brief A singleton class holding configuration. @@ -57,36 +60,11 @@ public: 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 { return _servers; } - std::vector > screens () const { - return _screens; - } - - 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; @@ -107,93 +85,136 @@ public: return _tms_password; } + /** @return The sound processor that we are using */ SoundProcessor const * sound_processor () const { return _sound_processor; } + 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; + } + /** @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 (std::string d) { _default_directory = d; - Changed (); } /** @param p New server port */ void set_server_port (int p) { _server_port = p; - Changed (); - } - - /** @param i New colour LUT index */ - void set_colour_lut_index (int i) { - _colour_lut_index = i; - Changed (); - } - - /** @param b New J2K bandwidth */ - void set_j2k_bandwidth (int b) { - _j2k_bandwidth = b; - Changed (); } /** @param s New list of servers */ void set_servers (std::vector s) { _servers = s; - Changed (); - } - - void set_screens (std::vector > s) { - _screens = s; - Changed (); } void set_reference_scaler (Scaler const * s) { _reference_scaler = s; - Changed (); } void set_reference_filters (std::vector const & f) { _reference_filters = f; - 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 */ 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 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 write () const; - boost::signals2::signal Changed; - static Config* instance (); + static void drop (); private: Config (); - std::string file () const; + std::string 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; @@ -201,17 +222,9 @@ private: std::string _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; - /** Screen definitions */ - std::vector > _screens; /** 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 */ @@ -226,6 +239,15 @@ 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; /** Singleton instance, or 0 */ static Config* _instance;