X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=f9d669371c0370b9cc8352041ea7556059411ce8;hb=9060f465fc05f44882e96a8b73551767e5a9d876;hp=baf446df318738c1176a7bc4188b9ddb1a961881;hpb=f598e06928af82fee1d2b25bc4cf25f560478ad4;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index baf446df3..f9d669371 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 */ @@ -77,7 +78,9 @@ public: SOUND, SOUND_OUTPUT, INTERFACE_COMPLEXITY, - PLAYER_DCP_DIRECTORY, + PLAYER_CONTENT_DIRECTORY, + PLAYER_PLAYLIST_DIRECTORY, + PLAYER_DEBUG_LOG, HISTORY, #ifdef DCPOMATIC_VARIANT_SWAROOP PLAYER_BACKGROUND_IMAGE, @@ -114,7 +117,7 @@ public: return _only_servers_encode; } - Protocol tms_protocol () const { + FileTransferProtocol tms_protocol () const { return _tms_protocol; } @@ -227,6 +230,10 @@ public: return _mail_port; } + EmailProtocol mail_protocol () const { + return _mail_protocol; + } + std::string mail_user () const { return _mail_user; } @@ -364,10 +371,12 @@ public: enum Nag { NAG_DKDM_CONFIG, NAG_ENCRYPTED_METADATA, - NAG_REMAKE_DECRYPTION_CHAIN, - NAG_BAD_SIGNER_CHAIN, + NAG_ALTER_DECRYPTION_CHAIN, + NAG_BAD_SIGNER_CHAIN_UTF8_STRINGS, /* Not really a nag but it's the same idea */ NAG_INITIAL_SETUP, + NAG_IMPORT_DECRYPTION_CHAIN, + NAG_BAD_SIGNER_CHAIN_VALIDITY_TOO_LONG, NAG_COUNT }; @@ -483,12 +492,20 @@ public: return _respect_kdm_validity_periods; } - boost::optional player_log_file () const { - return _player_log_file; + boost::optional player_activity_log_file () const { + return _player_activity_log_file; } - boost::optional player_dcp_directory () const { - return _player_dcp_directory; + boost::optional player_debug_log_file () const { + return _player_debug_log_file; + } + + boost::optional player_content_directory () const { + return _player_content_directory; + } + + boost::optional player_playlist_directory () const { + return _player_playlist_directory; } boost::optional player_kdm_directory () const { @@ -519,6 +536,10 @@ public: std::vector required_monitors () const { return _required_monitors; } + + boost::optional player_lock_file () const { + return _player_lock_file; + } #endif /* SET (mostly) */ @@ -548,7 +569,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); } @@ -667,6 +688,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); } @@ -847,7 +872,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); @@ -931,28 +958,52 @@ public: maybe_set (_respect_kdm_validity_periods, r); } - void set_player_log_file (boost::filesystem::path p) { - maybe_set (_player_log_file, p); + void set_player_activity_log_file (boost::filesystem::path p) { + maybe_set (_player_activity_log_file, p); } - void unset_player_log_file () { - if (!_player_log_file) { + void unset_player_activity_log_file () { + if (!_player_activity_log_file) { return; } - _player_log_file = boost::none; + _player_activity_log_file = boost::none; changed (); } - void set_player_dcp_directory (boost::filesystem::path p) { - maybe_set (_player_dcp_directory, p, PLAYER_DCP_DIRECTORY); + void set_player_debug_log_file (boost::filesystem::path p) { + maybe_set (_player_debug_log_file, p, PLAYER_DEBUG_LOG); + } + + void unset_player_debug_log_file () { + if (!_player_debug_log_file) { + return; + } + _player_debug_log_file = boost::none; + changed (PLAYER_DEBUG_LOG); + } + + void set_player_content_directory (boost::filesystem::path p) { + maybe_set (_player_content_directory, p, PLAYER_CONTENT_DIRECTORY); + } + + void unset_player_content_directory () { + if (!_player_content_directory) { + return; + } + _player_content_directory = boost::none; + changed (PLAYER_CONTENT_DIRECTORY); } - void unset_player_dcp_directory () { - if (!_player_dcp_directory) { + void set_player_playlist_directory (boost::filesystem::path p) { + maybe_set (_player_playlist_directory, p, PLAYER_PLAYLIST_DIRECTORY); + } + + void unset_player_playlist_directory () { + if (!_player_playlist_directory) { return; } - _player_dcp_directory = boost::none; - changed (PLAYER_DCP_DIRECTORY); + _player_playlist_directory = boost::none; + changed (PLAYER_PLAYLIST_DIRECTORY); } void set_player_kdm_directory (boost::filesystem::path p) { @@ -999,6 +1050,18 @@ public: void set_required_monitors (std::vector monitors) { maybe_set (_required_monitors, monitors); } + + void set_player_lock_file (boost::filesystem::path p) { + maybe_set (_player_lock_file, p); + } + + void unset_player_lock_file () { + if (!_player_lock_file) { + return; + } + _player_lock_file = boost::none; + changed (); + } #endif void changed (Property p = OTHER); @@ -1012,7 +1075,12 @@ public: /** Emitted if there is a bad certificate in the signer chain. Handler can call * true to ask Config to re-create the chain. */ - static boost::signals2::signal BadSignerChain; + enum BadSignerChainReason { + BAD_SIGNER_CHAIN_NONE = 0x0, + BAD_SIGNER_CHAIN_HAS_UTF8_STRINGS = 0x1, + BAD_SIGNER_CHAIN_VALIDITY_TOO_LONG = 0x2, + }; + static boost::signals2::signal BadSignerChain; void write () const; void write_config () const; @@ -1033,10 +1101,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 (); @@ -1049,6 +1113,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 @@ -1084,7 +1149,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 */ @@ -1095,6 +1160,7 @@ private: 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 */ bool _allow_any_dcp_frame_rate; @@ -1125,6 +1191,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; @@ -1139,10 +1206,16 @@ private: std::string _notification_bcc; std::string _notification_email; boost::shared_ptr _signer_chain; +#ifdef DCPOMATIC_VARIANT_SWAROOP + boost::filesystem::path _signer_chain_path; +#endif /** Chain used to decrypt KDMs; the leaf of this chain is the target * certificate for making KDMs given to DCP-o-matic. */ boost::shared_ptr _decryption_chain; +#ifdef DCPOMATIC_VARIANT_SWAROOP + boost::filesystem::path _decryption_chain_path; +#endif /** true to check for updates on startup */ bool _check_for_updates; bool _check_for_test_updates; @@ -1187,12 +1260,18 @@ private: PlayerMode _player_mode; int _image_display; bool _respect_kdm_validity_periods; - boost::optional _player_log_file; + /** Log file containing things the player does (e.g. started, stopped, loaded + playlist etc.) Does not contain debugging information. + */ + boost::optional _player_activity_log_file; + /** Log file containing debug information for the player */ + boost::optional _player_debug_log_file; /** A directory containing DCPs whose contents are presented to the user in the dual-screen player mode. DCPs on the list can be loaded for playback. */ - boost::optional _player_dcp_directory; + boost::optional _player_content_directory; + boost::optional _player_playlist_directory; boost::optional _player_kdm_directory; #ifdef DCPOMATIC_VARIANT_SWAROOP boost::optional _player_background_image; @@ -1203,6 +1282,8 @@ private: /** watermark duration in milliseconds */ int _player_watermark_duration; std::vector _required_monitors; + /** a file which, if specified, must be present for the player to work */ + boost::optional _player_lock_file; #endif static int const _current_version;