X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=ccd37ec1e22a2bc2d133b82138bf0a6268428196;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=791e41e8f6f27a14b5626e492fc714c824da027f;hpb=e8204f55c981493b99814f71a50b3c3d62601032;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 791e41e8f..ccd37ec1e 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 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "dci_metadata.h" #include "colour_conversion.h" #include "server.h" @@ -66,6 +66,7 @@ public: void set_use_any_servers (bool u) { _use_any_servers = u; + changed (); } bool use_any_servers () const { @@ -75,6 +76,7 @@ public: /** @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 */ @@ -87,7 +89,7 @@ public: 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; } @@ -114,6 +116,10 @@ public: std::list allowed_dcp_frame_rates () const { return _allowed_dcp_frame_rates; } + + bool allow_any_dcp_frame_rate () const { + return _allow_any_dcp_frame_rate; + } DCIMetadata default_dci_metadata () const { return _default_dci_metadata; @@ -135,7 +141,7 @@ public: return _default_dcp_content_type; } - libdcp::XMLMetadata dcp_metadata () const { + dcp::XMLMetadata dcp_metadata () const { return _dcp_metadata; } @@ -178,133 +184,176 @@ public: bool check_for_test_updates () const { return _check_for_test_updates; } + + int maximum_j2k_bandwidth () const { + return _maximum_j2k_bandwidth; + } + + int log_types () const { + return _log_types; + } /** @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; - } - - void set_reference_scaler (Scaler const * s) { - _reference_scaler = s; - } - - 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 */ + /** @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_allow_any_dcp_frame_rate (bool a) { + _allow_any_dcp_frame_rate = a; + 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_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; + void set_log_types (int t) { + _log_types = t; + changed (); + } + boost::filesystem::path signer_chain_directory () const; + void changed (); + boost::signals2::signal Changed; + static Config* instance (); static void drop (); @@ -313,6 +362,7 @@ private: 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; @@ -326,10 +376,6 @@ private: 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 */ - std::vector _reference_filters; /** 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 */ @@ -341,13 +387,15 @@ private: /** Our sound processor */ SoundProcessor const * _sound_processor; std::list _allowed_dcp_frame_rates; + /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */ + bool _allow_any_dcp_frame_rate; /** 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; + dcp::XMLMetadata _dcp_metadata; int _default_j2k_bandwidth; int _default_audio_delay; std::vector _colour_conversions; @@ -360,6 +408,9 @@ private: /** 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; + int _log_types; /** Singleton instance, or 0 */ static Config* _instance;