X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=9a57b1b484624b36a73055911944e1ae374a78d1;hb=1bfc60e40f533c6d931a915deabd97899719eb4b;hp=21463fdb5bc44500ca16827acbfc6f766ee06b7c;hpb=8f7fdb9fdcd4ffd076f07de9f49801fe01991776;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 21463fdb5..9a57b1b48 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -27,6 +27,7 @@ #include "isdcf_metadata.h" #include "types.h" +#include "state.h" #include "edid.h" #include #include @@ -46,7 +47,7 @@ class DKDMGroup; /** @class Config * @brief A singleton class holding configuration. */ -class Config : public boost::noncopyable +class Config : public State { public: /** @return number of threads which a master DoM should use for J2K encoding on the local machine */ @@ -116,7 +117,7 @@ public: return _only_servers_encode; } - Protocol tms_protocol () const { + FileTransferProtocol tms_protocol () const { return _tms_protocol; } @@ -140,11 +141,6 @@ public: return _tms_password; } - /** @return The cinema sound processor that we are using */ - CinemaSoundProcessor const * cinema_sound_processor () const { - return _cinema_sound_processor; - } - std::list > cinemas () const { return _cinemas; } @@ -229,6 +225,10 @@ public: return _mail_port; } + EmailProtocol mail_protocol () const { + return _mail_protocol; + } + std::string mail_user () const { return _mail_user; } @@ -366,10 +366,13 @@ public: enum Nag { NAG_DKDM_CONFIG, NAG_ENCRYPTED_METADATA, - NAG_REMAKE_DECRYPTION_CHAIN, + NAG_ALTER_DECRYPTION_CHAIN, NAG_BAD_SIGNER_CHAIN, /* Not really a nag but it's the same idea */ NAG_INITIAL_SETUP, + NAG_IMPORT_DECRYPTION_CHAIN, + NAG_DELETE_DKDM, + NAG_32_ON_64, NAG_COUNT }; @@ -481,6 +484,15 @@ public: return _image_display; } + enum VideoViewType { + VIDEO_VIEW_SIMPLE, + VIDEO_VIEW_OPENGL + }; + + VideoViewType video_view_type () const { + return _video_view_type; + } + bool respect_kdm_validity_periods () const { return _respect_kdm_validity_periods; } @@ -562,7 +574,7 @@ public: maybe_set (_only_servers_encode, o); } - void set_tms_protocol (Protocol p) { + void set_tms_protocol (FileTransferProtocol p) { maybe_set (_tms_protocol, p); } @@ -681,6 +693,10 @@ public: maybe_set (_mail_port, p); } + void set_mail_protocol (EmailProtocol p) { + maybe_set (_mail_protocol, p); + } + void set_mail_user (std::string u) { maybe_set (_mail_user, u); } @@ -861,7 +877,9 @@ public: } void add_to_history (boost::filesystem::path p); + void clean_history (); void add_to_player_history (boost::filesystem::path p); + void clean_player_history (); void set_jump_to_selected (bool j) { maybe_set (_jump_to_selected, j); @@ -941,6 +959,10 @@ public: maybe_set (_image_display, n); } + void set_video_view_type (VideoViewType v) { + maybe_set (_video_view_type, v); + } + void set_respect_kdm_validity_periods (bool r) { maybe_set (_respect_kdm_validity_periods, r); } @@ -1059,10 +1081,16 @@ public: static boost::signals2::signal FailedToLoad; /** Emitted if read() issued a warning which the user might want to know about */ static boost::signals2::signal Warning; - /** Emitted if there is a bad certificate in the signer chain. Handler can call - * true to ask Config to re-create the chain. + /** Emitted if there is a something wrong the contents of our config. Handler can call + * true to ask Config to solve the problem (by discarding and recreating the bad thing) */ - static boost::signals2::signal BadSignerChain; + enum BadReason { + BAD_SIGNER_UTF8_STRINGS, ///< signer chain contains UTF-8 strings (not PRINTABLESTRING) + BAD_SIGNER_INCONSISTENT, ///< signer chain is somehow inconsistent + BAD_DECRYPTION_INCONSISTENT, ///< KDM decryption chain is somehow inconsistent + }; + + static boost::signals2::signal Bad; void write () const; void write_config () const; @@ -1083,10 +1111,6 @@ public: static void restore_defaults (); static bool have_existing (std::string); static boost::filesystem::path config_file (); - static boost::filesystem::path path (std::string file, bool create_directories = true); - - /** If set, this overrides the standard path (in home, Library, AppData or wherever) for config.xml and cinemas.xml */ - static boost::optional override_path; private: Config (); @@ -1099,6 +1123,7 @@ private: boost::shared_ptr create_certificate_chain (); boost::filesystem::path directory_or (boost::optional dir, boost::filesystem::path a) const; void add_to_history_internal (std::vector& h, boost::filesystem::path p); + void clean_history_internal (std::vector& h); void backup (); template @@ -1134,7 +1159,7 @@ private: /** J2K encoding servers that should definitely be used */ std::vector _servers; bool _only_servers_encode; - Protocol _tms_protocol; + FileTransferProtocol _tms_protocol; /** 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 */ @@ -1143,8 +1168,6 @@ private: std::string _tms_user; /** Password to log into the TMS with */ std::string _tms_password; - /** Our cinema sound processor */ - CinemaSoundProcessor const * _cinema_sound_processor; /** The list of possible DCP frame rates that DCP-o-matic will use */ std::list _allowed_dcp_frame_rates; /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */ @@ -1176,6 +1199,7 @@ private: std::list > _cinemas; std::string _mail_server; int _mail_port; + EmailProtocol _mail_protocol; std::string _mail_user; std::string _mail_password; std::string _kdm_subject; @@ -1243,6 +1267,7 @@ private: Interface _interface_complexity; PlayerMode _player_mode; int _image_display; + VideoViewType _video_view_type; bool _respect_kdm_validity_periods; /** Log file containing things the player does (e.g. started, stopped, loaded playlist etc.) Does not contain debugging information.