X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=99b3eb62122e00529502db5100f5e069a35c4c3e;hb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;hp=ee11dcadbefb071cf606a07e9114275a5974c469;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index ee11dcadb..99b3eb621 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -29,14 +29,16 @@ #include #include #include -#include "dci_metadata.h" +#include +#include +#include "isdcf_metadata.h" #include "colour_conversion.h" -#include "server.h" +#include "video_content.h" class ServerDescription; class Scaler; class Filter; -class SoundProcessor; +class CinemaSoundProcessor; class DCPContentType; class Ratio; class Cinema; @@ -104,9 +106,9 @@ public: return _tms_password; } - /** @return The sound processor that we are using */ - SoundProcessor const * sound_processor () const { - return _sound_processor; + /** @return The cinema sound processor that we are using */ + CinemaSoundProcessor const * cinema_sound_processor () const { + return _cinema_sound_processor; } std::list > cinemas () const { @@ -116,9 +118,13 @@ 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; + ISDCFMetadata default_isdcf_metadata () const { + return _default_isdcf_metadata; } boost::optional language () const { @@ -129,6 +135,10 @@ public: return _default_still_length; } + VideoContentScale default_scale () const { + return _default_scale; + } + Ratio const * default_container () const { return _default_container; } @@ -137,8 +147,8 @@ public: return _default_dcp_content_type; } - dcp::XMLMetadata dcp_metadata () const { - return _dcp_metadata; + std::string dcp_issuer () const { + return _dcp_issuer; } int default_j2k_bandwidth () const { @@ -165,14 +175,38 @@ public: return _mail_password; } + std::string kdm_subject () const { + return _kdm_subject; + } + std::string kdm_from () const { return _kdm_from; } + std::string kdm_cc () const { + return _kdm_cc; + } + + std::string kdm_bcc () const { + return _kdm_bcc; + } + std::string kdm_email () const { return _kdm_email; } + boost::shared_ptr signer () const { + return _signer; + } + + dcp::Certificate decryption_certificate () const { + return _decryption_certificate; + } + + std::string decryption_private_key () const { + return _decryption_private_key; + } + bool check_for_updates () const { return _check_for_updates; } @@ -184,7 +218,15 @@ public: int maximum_j2k_bandwidth () const { return _maximum_j2k_bandwidth; } - + + int log_types () const { + return _log_types; + } + + std::vector history () const { + return _history; + } + /** @param n New number of local encoding threads */ void set_num_local_encoding_threads (int n) { _num_local_encoding_threads = n; @@ -241,8 +283,13 @@ public: changed (); } - void set_default_dci_metadata (DCIMetadata d) { - _default_dci_metadata = d; + void set_allow_any_dcp_frame_rate (bool a) { + _allow_any_dcp_frame_rate = a; + changed (); + } + + void set_default_isdcf_metadata (ISDCFMetadata d) { + _default_isdcf_metadata = d; changed (); } @@ -261,6 +308,11 @@ public: changed (); } + void set_default_scale (VideoContentScale s) { + _default_scale = s; + changed (); + } + void set_default_container (Ratio const * c) { _default_container = c; changed (); @@ -271,8 +323,8 @@ public: changed (); } - void set_dcp_metadata (dcp::XMLMetadata m) { - _dcp_metadata = m; + void set_dcp_issuer (std::string i) { + _dcp_issuer = i; changed (); } @@ -306,16 +358,48 @@ public: changed (); } + void set_kdm_subject (std::string s) { + _kdm_subject = s; + changed (); + } + void set_kdm_from (std::string f) { _kdm_from = f; changed (); } + void set_kdm_cc (std::string f) { + _kdm_cc = f; + changed (); + } + + void set_kdm_bcc (std::string f) { + _kdm_bcc = f; + changed (); + } + void set_kdm_email (std::string e) { _kdm_email = e; changed (); } + void reset_kdm_email (); + + void set_signer (boost::shared_ptr s) { + _signer = s; + changed (); + } + + void set_decryption_certificate (dcp::Certificate c) { + _decryption_certificate = c; + changed (); + } + + void set_decryption_private_key (std::string k) { + _decryption_private_key = k; + changed (); + } + void set_check_for_updates (bool c) { _check_for_updates = c; changed (); @@ -330,9 +414,19 @@ public: _maximum_j2k_bandwidth = b; changed (); } - - boost::filesystem::path signer_chain_directory () const; + void set_log_types (int t) { + _log_types = t; + changed (); + } + + void clear_history () { + _history.clear (); + changed (); + } + + void add_to_history (boost::filesystem::path p); + void changed (); boost::signals2::signal Changed; @@ -343,8 +437,8 @@ private: Config (); boost::filesystem::path file (bool) const; void read (); - void read_old_metadata (); void write () const; + void make_decryption_keys (); /** number of threads to use for J2K encoding on the local machine */ int _num_local_encoding_threads; @@ -366,16 +460,19 @@ private: std::string _tms_user; /** Password to log into the TMS with */ std::string _tms_password; - /** Our sound processor */ - SoundProcessor const * _sound_processor; + /** Our cinema sound processor */ + CinemaSoundProcessor const * _cinema_sound_processor; std::list _allowed_dcp_frame_rates; - /** Default DCI metadata for newly-created Films */ - DCIMetadata _default_dci_metadata; + /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */ + bool _allow_any_dcp_frame_rate; + /** Default ISDCF metadata for newly-created Films */ + ISDCFMetadata _default_isdcf_metadata; boost::optional _language; int _default_still_length; + VideoContentScale _default_scale; Ratio const * _default_container; DCPContentType const * _default_dcp_content_type; - dcp::XMLMetadata _dcp_metadata; + std::string _dcp_issuer; int _default_j2k_bandwidth; int _default_audio_delay; std::vector _colour_conversions; @@ -383,14 +480,22 @@ private: std::string _mail_server; std::string _mail_user; std::string _mail_password; + std::string _kdm_subject; std::string _kdm_from; + std::string _kdm_cc; + std::string _kdm_bcc; std::string _kdm_email; + boost::shared_ptr _signer; + dcp::Certificate _decryption_certificate; + std::string _decryption_private_key; /** 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; + std::vector _history; + /** Singleton instance, or 0 */ static Config* _instance; };