X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=45a9e282b7aed6ea638c540d264defd3df26b21a;hb=5c93e50af883f02eadcf9a7bfe9cbfabbb3be844;hp=d9f104c7dec1a9c33cb29b0310ffc6c386367be4;hpb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index d9f104c7d..45a9e282b 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -24,18 +24,21 @@ #ifndef DCPOMATIC_CONFIG_H #define DCPOMATIC_CONFIG_H -#include +#include "isdcf_metadata.h" +#include "colour_conversion.h" +#include "video_content.h" +#include +#include +#include #include #include #include -#include -#include "isdcf_metadata.h" -#include "colour_conversion.h" +#include class ServerDescription; class Scaler; class Filter; -class SoundProcessor; +class CinemaSoundProcessor; class DCPContentType; class Ratio; class Cinema; @@ -103,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 { @@ -140,8 +143,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 { @@ -168,6 +171,10 @@ public: return _mail_password; } + std::string kdm_subject () const { + return _kdm_subject; + } + std::string kdm_from () const { return _kdm_from; } @@ -175,11 +182,27 @@ public: 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; } @@ -195,7 +218,17 @@ public: int log_types () const { return _log_types; } - + +#ifdef DCPOMATIC_WINDOWS + bool win32_console () const { + return _win32_console; + } +#endif + + 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; @@ -287,8 +320,8 @@ public: changed (); } - void set_dcp_metadata (dcp::XMLMetadata m) { - _dcp_metadata = m; + void set_dcp_issuer (std::string i) { + _dcp_issuer = i; changed (); } @@ -322,6 +355,11 @@ public: changed (); } + void set_kdm_subject (std::string s) { + _kdm_subject = s; + changed (); + } + void set_kdm_from (std::string f) { _kdm_from = f; changed (); @@ -331,6 +369,11 @@ public: _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; @@ -339,6 +382,21 @@ public: 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 (); @@ -358,9 +416,21 @@ public: _log_types = t; changed (); } - - boost::filesystem::path signer_chain_directory () const; +#ifdef DCPOMATIC_WINDOWS + void set_win32_console (bool c) { + _win32_console = c; + changed (); + } +#endif + + void clear_history () { + _history.clear (); + changed (); + } + + void add_to_history (boost::filesystem::path p); + void changed (); boost::signals2::signal Changed; @@ -369,10 +439,10 @@ public: private: Config (); - boost::filesystem::path file (bool) const; + boost::filesystem::path file () 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; @@ -394,8 +464,8 @@ 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; /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */ bool _allow_any_dcp_frame_rate; @@ -405,7 +475,7 @@ private: int _default_still_length; 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; @@ -413,16 +483,25 @@ 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; - +#ifdef DCPOMATIC_WINDOWS + bool _win32_console; +#endif + std::vector _history; + /** Singleton instance, or 0 */ static Config* _instance; };