X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=a982c9727623783a48b0f7cfc5659480c630613e;hb=e075012124424b77044b5d61885ed2646d3781cd;hp=dd20b58e7d66974a1d7435dafb760ee68144886f;hpb=264583479e79b481251f1772b228f82cd77552d3;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index dd20b58e7..a982c9727 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -79,6 +79,7 @@ public: INTERFACE_COMPLEXITY, PLAYER_CONTENT_DIRECTORY, PLAYER_PLAYLIST_DIRECTORY, + PLAYER_DEBUG_LOG, HISTORY, #ifdef DCPOMATIC_VARIANT_SWAROOP PLAYER_BACKGROUND_IMAGE, @@ -115,7 +116,7 @@ public: return _only_servers_encode; } - Protocol tms_protocol () const { + FileTransferProtocol tms_protocol () const { return _tms_protocol; } @@ -228,6 +229,10 @@ public: return _mail_port; } + EmailProtocol mail_protocol () const { + return _mail_protocol; + } + std::string mail_user () const { return _mail_user; } @@ -365,10 +370,11 @@ 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_COUNT }; @@ -484,8 +490,12 @@ 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_debug_log_file () const { + return _player_debug_log_file; } boost::optional player_content_directory () const { @@ -530,10 +540,6 @@ public: } #endif - bool allow_spl_editing () const { - return _allow_spl_editing; - } - /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -561,7 +567,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); } @@ -680,6 +686,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); } @@ -860,7 +870,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); @@ -944,18 +956,30 @@ 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_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); } @@ -1038,10 +1062,6 @@ public: } #endif - void set_allow_spl_editing (bool s) { - maybe_set (_allow_spl_editing, s); - } - void changed (Property p = OTHER); boost::signals2::signal Changed; /** Emitted if read() failed on an existing Config file. There is nothing @@ -1090,6 +1110,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 @@ -1125,7 +1146,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 */ @@ -1136,6 +1157,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; @@ -1166,6 +1188,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; @@ -1180,10 +1203,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; @@ -1228,7 +1257,12 @@ 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. @@ -1248,7 +1282,6 @@ private: /** a file which, if specified, must be present for the player to work */ boost::optional _player_lock_file; #endif - bool _allow_spl_editing; static int const _current_version;