X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=90ebb0b33c3518022837d033fda1d95ca56b74e8;hb=a69d242f3f00207d6ea7320e6723775f4b0dbfb3;hp=2fd36059a6b9326ffe84b9ed7825829288ad6600;hpb=71b42c48087a4f05f55166e328d1bea3b2b2228b;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 2fd36059a..90ebb0b33 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -40,6 +40,7 @@ class DCPContentType; class Ratio; class Cinema; class Film; +class DKDMGroup; /** @class Config * @brief A singleton class holding configuration. @@ -47,9 +48,14 @@ class Film; class Config : public boost::noncopyable { public: - /** @return number of threads to use for J2K encoding on the local machine */ - int num_local_encoding_threads () const { - return _num_local_encoding_threads; + /** @return number of threads which a master DoM should use for J2K encoding on the local machine */ + int master_encoding_threads () const { + return _master_encoding_threads; + } + + /** @return number of threads which a server should use for J2K encoding on the local machine */ + int server_encoding_threads () const { + return _server_encoding_threads; } boost::optional default_directory () const { @@ -67,6 +73,7 @@ public: USE_ANY_SERVERS, SERVERS, CINEMAS, + SOUND, SOUND_OUTPUT, OTHER }; @@ -157,6 +164,10 @@ public: return _default_container; } + Ratio const * default_scale_to () const { + return _default_scale_to; + } + DCPContentType const * default_dcp_content_type () const { return _default_dcp_content_type; } @@ -185,6 +196,10 @@ public: return _default_interop; } + bool default_upload_after_make_dcp () { + return _default_upload_after_make_dcp; + } + void set_default_kdm_directory (boost::filesystem::path d) { if (_default_kdm_directory && _default_kdm_directory.get() == d) { return; @@ -271,7 +286,11 @@ public: return _history; } - std::vector dkdms () const { + std::vector player_history () const { + return _player_history; + } + + boost::shared_ptr dkdms () const { return _dkdms; } @@ -307,13 +326,68 @@ public: return _jump_to_selected; } + enum Nag { + NAG_DKDM_CONFIG, + NAG_ENCRYPTED_METADATA, + NAG_REMAKE_DECRYPTION_CHAIN, + NAG_COUNT + }; + + bool nagged (Nag nag) const { + return _nagged[nag]; + } + + bool sound () const { + return _sound; + } + + std::string cover_sheet () const { + return _cover_sheet; + } + boost::optional sound_output () const { return _sound_output; } - /** @param n New number of local encoding threads */ - void set_num_local_encoding_threads (int n) { - maybe_set (_num_local_encoding_threads, n); + boost::optional last_player_load_directory () const { + return _last_player_load_directory; + } + + enum KDMWriteType { + KDM_WRITE_FLAT, + KDM_WRITE_FOLDER, + KDM_WRITE_ZIP + }; + + boost::optional last_kdm_write_type () const { + return _last_kdm_write_type; + } + + enum DKDMWriteType { + DKDM_WRITE_INTERNAL, + DKDM_WRITE_FILE + }; + + boost::optional last_dkdm_write_type () const { + return _last_dkdm_write_type; + } + + int frames_in_memory_multiplier () const { + return _frames_in_memory_multiplier; + } + + boost::optional decode_reduction () const { + return _decode_reduction; + } + + /* SET (mostly) */ + + void set_master_encoding_threads (int n) { + maybe_set (_master_encoding_threads, n); + } + + void set_server_encoding_threads (int n) { + maybe_set (_server_encoding_threads, n); } void set_default_directory (boost::filesystem::path d) { @@ -404,6 +478,10 @@ public: maybe_set (_default_container, c); } + void set_default_scale_to (Ratio const * c) { + maybe_set (_default_scale_to, c); + } + void set_default_dcp_content_type (DCPContentType const * t) { maybe_set (_default_dcp_content_type, t); } @@ -432,6 +510,10 @@ public: maybe_set (_default_interop, i); } + void set_default_upload_after_make_dcp (bool u) { + maybe_set (_default_upload_after_make_dcp, u); + } + void set_mail_server (std::string s) { maybe_set (_mail_server, s); } @@ -511,7 +593,7 @@ public: } #endif - void set_dkdms (std::vector dkdms) { + void set_dkdms (boost::shared_ptr dkdms) { _dkdms = dkdms; changed (); } @@ -526,13 +608,27 @@ public: maybe_set (_confirm_kdm_email, s); } - void set_sound_output (std::string o) - { + void set_sound (bool s) { + maybe_set (_sound, s, SOUND); + } + + void set_sound_output (std::string o) { maybe_set (_sound_output, o, SOUND_OUTPUT); } - void unset_sound_output () - { + void set_last_player_load_directory (boost::filesystem::path d) { + maybe_set (_last_player_load_directory, d); + } + + void set_last_kdm_write_type (KDMWriteType t) { + maybe_set (_last_kdm_write_type, t); + } + + void set_last_dkdm_write_type (DKDMWriteType t) { + maybe_set (_last_dkdm_write_type, t); + } + + void unset_sound_output () { if (!_sound_output) { return; } @@ -557,27 +653,55 @@ public: maybe_set (_dcp_asset_filename_format, n); } + void set_frames_in_memory_multiplier (int m) { + maybe_set (_frames_in_memory_multiplier, m); + } + + void set_decode_reduction (boost::optional r) { + maybe_set (_decode_reduction, r); + } + void clear_history () { _history.clear (); changed (); } + void clear_player_history () { + _player_history.clear (); + changed (); + } + void add_to_history (boost::filesystem::path p); + void add_to_player_history (boost::filesystem::path p); void set_jump_to_selected (bool j) { maybe_set (_jump_to_selected, j); } + void set_nagged (Nag nag, bool nagged) { + maybe_set (_nagged[nag], nagged); + } + + void set_cover_sheet (std::string s) { + maybe_set (_cover_sheet, s); + } + + void reset_cover_sheet (); + void changed (Property p = OTHER); boost::signals2::signal Changed; /** Emitted if read() failed on an existing Config file. There is nothing a listener can do about it: this is just for information. */ static boost::signals2::signal FailedToLoad; + /** Emitted if read() issued a warning which the user might want to know about */ + static boost::signals2::signal Warning; void write () const; void write_config () const; void write_cinemas () const; + void link (boost::filesystem::path new_file) const; + void copy_and_link (boost::filesystem::path new_file) const; void save_template (boost::shared_ptr film, std::string name) const; bool existing_template (std::string name) const; @@ -590,6 +714,9 @@ public: static void drop (); static void restore_defaults (); static bool have_existing (std::string); + static boost::filesystem::path config_file (); + + static boost::optional test_path; private: Config (); @@ -597,9 +724,12 @@ private: void read (); void set_defaults (); void set_kdm_email_to_default (); + void set_cover_sheet_to_default (); void read_cinemas (cxml::Document const & f); 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 backup (); template void maybe_set (T& member, T new_value, Property prop = OTHER) { @@ -619,8 +749,10 @@ private: changed (prop); } - /** number of threads to use for J2K encoding on the local machine */ - int _num_local_encoding_threads; + /** number of threads which a master DoM should use for J2K encoding on the local machine */ + int _master_encoding_threads; + /** number of threads which a server should use for J2K encoding on the local machine */ + int _server_encoding_threads; /** default directory to put new films in */ boost::optional _default_directory; /** base port number to use for J2K encoding servers; @@ -652,6 +784,7 @@ private: /** Default length of still image content (seconds) */ int _default_still_length; Ratio const * _default_container; + Ratio const * _default_scale_to; DCPContentType const * _default_dcp_content_type; int _default_dcp_audio_channels; std::string _dcp_issuer; @@ -663,6 +796,7 @@ private: the home directory will be offered. */ boost::optional _default_kdm_directory; + bool _default_upload_after_make_dcp; std::list > _cinemas; std::string _mail_server; int _mail_port; @@ -690,7 +824,8 @@ private: bool _win32_console; #endif std::vector _history; - std::vector _dkdms; + std::vector _player_history; + boost::shared_ptr _dkdms; boost::filesystem::path _cinemas_file; bool _show_hints_before_make_dcp; bool _confirm_kdm_email; @@ -699,8 +834,18 @@ private: dcp::NameFormat _dcp_metadata_filename_format; dcp::NameFormat _dcp_asset_filename_format; bool _jump_to_selected; - /** name of a specific sound output stream to use for preview */ + bool _nagged[NAG_COUNT]; + bool _sound; + /** name of a specific sound output stream to use, or empty to use the default */ boost::optional _sound_output; + std::string _cover_sheet; + boost::optional _last_player_load_directory; + boost::optional _last_kdm_write_type; + boost::optional _last_dkdm_write_type; + int _frames_in_memory_multiplier; + boost::optional _decode_reduction; + + static int const _current_version; /** Singleton instance, or 0 */ static Config* _instance;