X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=05421c20a7688ddf6b3fc8c4ea7667d16b151931;hb=c98d6fd22da1586ef3c1d64a2f7b1ee602f539e9;hp=e425a976cf6c2315dfe31dd3129e33866c5c2571;hpb=26866fdeba6dd868b1809de49799690555164f70;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index e425a976c..05421c20a 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -28,9 +28,9 @@ #include "audio_mapping.h" +#include "export_config.h" #include "rough_duration.h" #include "state.h" -#include "types.h" #include #include #include @@ -79,6 +79,8 @@ public: boost::filesystem::path default_directory_or (boost::filesystem::path a) const; boost::filesystem::path default_kdm_directory_or (boost::filesystem::path a) const; + void load_from_zip(boost::filesystem::path zip_file); + enum Property { USE_ANY_SERVERS, SERVERS, @@ -93,6 +95,11 @@ public: SHOW_EXPERIMENTAL_AUDIO_PROCESSORS, AUDIO_MAPPING, AUTO_CROP_THRESHOLD, + ALLOW_SMPTE_BV20, + ISDCF_NAME_PART_LENGTH, +#ifdef DCPOMATIC_GROK + GROK, +#endif OTHER }; @@ -129,6 +136,10 @@ public: return _tms_protocol; } + bool tms_passive() const { + return _tms_passive; + } + /** @return The IP address of a TMS that we can copy DCPs to */ std::string tms_ip () const { return _tms_ip; @@ -173,6 +184,10 @@ public: return _allow_96khz_audio; } + bool use_all_audio_channels () const { + return _use_all_audio_channels; + } + bool show_experimental_audio_processors () const { return _show_experimental_audio_processors; } @@ -185,10 +200,6 @@ public: return _default_still_length; } - Ratio const * default_container () const { - return _default_container; - } - DCPContentType const * default_dcp_content_type () const { return _default_dcp_content_type; } @@ -221,8 +232,8 @@ public: return _dcp_j2k_comment; } - int default_j2k_bandwidth () const { - return _default_j2k_bandwidth; + int64_t default_video_bit_rate() const { + return _default_video_bit_rate; } int default_audio_delay () const { @@ -233,6 +244,14 @@ public: return _default_interop; } + boost::optional default_audio_language() const { + return _default_audio_language; + } + + boost::optional default_territory() const { + return _default_territory; + } + std::map default_metadata () const { return _default_metadata; } @@ -329,8 +348,8 @@ public: return _check_for_test_updates; } - int maximum_j2k_bandwidth () const { - return _maximum_j2k_bandwidth; + int64_t maximum_video_bit_rate() const { + return _maximum_video_bit_rate; } int log_types () const { @@ -416,6 +435,7 @@ public: NAG_32_ON_64, NAG_TOO_MANY_DROPPED_FRAMES, NAG_BAD_SIGNER_CHAIN_VALIDITY, + NAG_BAD_SIGNER_DN_QUALIFIER, NAG_COUNT }; @@ -514,6 +534,14 @@ public: return _player_mode; } + bool player_restricted_menus() const { + return _player_restricted_menus; + } + + bool playlist_editor_restricted_menus() const { + return _playlist_editor_restricted_menus; + } + int image_display () const { return _image_display; } @@ -553,9 +581,7 @@ public: return _custom_languages; } - boost::optional add_files_path () const { - return _add_files_path; - } + boost::optional initial_path(std::string id) const; bool use_isdcf_name_by_default () const { return _use_isdcf_name_by_default; @@ -581,6 +607,57 @@ public: return _auto_crop_threshold; } + boost::optional last_release_notes_version () const { + return _last_release_notes_version; + } + + boost::optional main_divider_sash_position() const { + return _main_divider_sash_position; + } + + boost::optional main_content_divider_sash_position() const { + return _main_content_divider_sash_position; + } + + enum class DefaultAddFileLocation { + SAME_AS_LAST_TIME, + SAME_AS_PROJECT + }; + + DefaultAddFileLocation default_add_file_location() const { + return _default_add_file_location; + } + + bool allow_smpte_bv20() const { + return _allow_smpte_bv20; + } + +#ifdef DCPOMATIC_GROK + class Grok + { + public: + Grok() = default; + Grok(cxml::ConstNodePtr node); + + void as_xml(xmlpp::Element* node) const; + + bool enable = false; + boost::filesystem::path binary_location; + int selected = 0; + std::string licence_server; + int licence_port = 5000; + std::string licence; + }; + + boost::optional grok() const { + return _grok; + } +#endif + + int isdcf_name_part_length() const { + return _isdcf_name_part_length; + } + /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -612,6 +689,10 @@ public: maybe_set (_tms_protocol, p); } + void set_tms_passive(bool passive) { + maybe_set(_tms_passive, passive); + } + /** @param i IP address of a TMS that we can copy DCPs to */ void set_tms_ip (std::string i) { maybe_set (_tms_ip, i); @@ -668,6 +749,10 @@ public: maybe_set (_allow_96khz_audio, a); } + void set_use_all_audio_channels (bool a) { + maybe_set (_use_all_audio_channels, a); + } + void set_show_experimental_audio_processors (bool e) { maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS); } @@ -693,10 +778,6 @@ public: maybe_set (_default_still_length, s); } - void set_default_container (Ratio const * c) { - maybe_set (_default_container, c); - } - void set_default_dcp_content_type (DCPContentType const * t) { maybe_set (_default_dcp_content_type, t); } @@ -729,8 +810,8 @@ public: maybe_set (_dcp_j2k_comment, c); } - void set_default_j2k_bandwidth (int b) { - maybe_set (_default_j2k_bandwidth, b); + void set_default_video_bit_rate(int64_t b) { + maybe_set(_default_video_bit_rate, b); } void set_default_audio_delay (int d) { @@ -741,6 +822,22 @@ public: maybe_set (_default_interop, i); } + void set_default_audio_language(dcp::LanguageTag tag) { + maybe_set(_default_audio_language, tag); + } + + void unset_default_audio_language() { + maybe_set(_default_audio_language, boost::optional()); + } + + void set_default_territory(dcp::LanguageTag::RegionSubtag tag) { + maybe_set(_default_territory, tag); + } + + void unset_default_territory() { + maybe_set(_default_territory, boost::optional()); + } + void set_default_metadata (std::map const& metadata) { maybe_set (_default_metadata, metadata); } @@ -836,8 +933,8 @@ public: maybe_set (_check_for_test_updates, c); } - void set_maximum_j2k_bandwidth (int b) { - maybe_set (_maximum_j2k_bandwidth, b); + void set_maximum_video_bit_rate(int64_t b) { + maybe_set(_maximum_video_bit_rate, b); } void set_log_types (int t) { @@ -1084,10 +1181,7 @@ public: void add_custom_language (dcp::LanguageTag tag); - void set_add_files_path (boost::filesystem::path p) { - _add_files_path = p; - changed (); - } + void set_initial_path(std::string id, boost::filesystem::path path); void set_use_isdcf_name_by_default (bool use) { maybe_set (_use_isdcf_name_by_default, use); @@ -1113,12 +1207,54 @@ public: maybe_set (_auto_crop_threshold, threshold, AUTO_CROP_THRESHOLD); } + void set_last_release_notes_version (std::string version) { + maybe_set (_last_release_notes_version, version); + } + + void unset_last_release_notes_version() { + maybe_set(_last_release_notes_version, boost::optional()); + } + + ExportConfig& export_config() { + return _export; + } + + void set_main_divider_sash_position(int position) { + maybe_set(_main_divider_sash_position, position); + } + + void set_main_content_divider_sash_position(int position) { + maybe_set(_main_content_divider_sash_position, position); + } + + void set_default_add_file_location(DefaultAddFileLocation location) { + maybe_set(_default_add_file_location, location); + } + + void set_allow_smpte_bv20(bool allow) { + maybe_set(_allow_smpte_bv20, allow, ALLOW_SMPTE_BV20); + } + +#ifdef DCPOMATIC_GROK + void set_grok(Grok const& grok); +#endif + + void set_isdcf_name_part_length(int length) { + maybe_set(_isdcf_name_part_length, length, ISDCF_NAME_PART_LENGTH); + } + + 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; + enum class LoadFailure { + CONFIG, + CINEMAS, + DKDM_RECIPIENTS + }; + 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 something wrong the contents of our config. Handler can call @@ -1129,6 +1265,7 @@ public: BAD_SIGNER_INCONSISTENT, ///< signer chain is somehow inconsistent BAD_DECRYPTION_INCONSISTENT, ///< KDM decryption chain is somehow inconsistent BAD_SIGNER_VALIDITY_TOO_LONG, ///< signer certificate validity periods are >10 years + BAD_SIGNER_DN_QUALIFIER, ///< some signer certificate has a bad dnQualifier (DoM #2716). }; static boost::signals2::signal Bad; @@ -1158,21 +1295,6 @@ public: static boost::filesystem::path config_read_file (); static boost::filesystem::path config_write_file (); -private: - Config (); - void read () override; - void set_defaults (); - void set_kdm_email_to_default (); - void set_notification_email_to_default (); - void set_cover_sheet_to_default (); - void read_cinemas (cxml::Document const & f); - void read_dkdm_recipients (cxml::Document const & f); - std::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 void maybe_set (T& member, T new_value, Property prop = OTHER) { if (member == new_value) { @@ -1191,6 +1313,24 @@ private: changed (prop); } +private: + Config (); + void read () override; + void read_config(); + void read_cinemas(); + void read_dkdm_recipients(); + void set_defaults (); + void set_kdm_email_to_default (); + void set_notification_email_to_default (); + void set_cover_sheet_to_default (); + void read_cinemas (cxml::Document const & f); + void read_dkdm_recipients (cxml::Document const & f); + std::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 (); + /** 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 */ @@ -1207,6 +1347,7 @@ private: std::vector _servers; bool _only_servers_encode; FileTransferProtocol _tms_protocol; + bool _tms_passive; /** 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 */ @@ -1225,12 +1366,12 @@ private: */ bool _allow_any_container; bool _allow_96khz_audio; + bool _use_all_audio_channels; /** Offer the upmixers in the audio processor settings */ bool _show_experimental_audio_processors; boost::optional _language; /** Default length of still image content (seconds) */ int _default_still_length; - Ratio const * _default_container; DCPContentType const * _default_dcp_content_type; int _default_dcp_audio_channels; std::string _dcp_issuer; @@ -1239,9 +1380,11 @@ private: std::string _dcp_product_name; std::string _dcp_product_version; std::string _dcp_j2k_comment; - int _default_j2k_bandwidth; + int64_t _default_video_bit_rate; int _default_audio_delay; bool _default_interop; + boost::optional _default_audio_language; + boost::optional _default_territory; std::map _default_metadata; /** Default directory to offer to write KDMs to; if it's not set, the home directory will be offered. @@ -1274,8 +1417,8 @@ private: /** 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; + /** maximum allowed video bit rate in bits per second */ + int64_t _maximum_video_bit_rate; int _log_types; bool _analyse_ebur128; bool _automatic_audio_analysis; @@ -1314,6 +1457,8 @@ private: boost::optional _gdc_username; boost::optional _gdc_password; PlayerMode _player_mode; + bool _player_restricted_menus = false; + bool _playlist_editor_restricted_menus = false; int _image_display; VideoViewType _video_view_type; bool _respect_kdm_validity_periods; @@ -1328,13 +1473,25 @@ private: boost::optional _player_kdm_directory; boost::optional _audio_mapping; std::vector _custom_languages; - boost::optional _add_files_path; + std::map> _initial_paths; bool _use_isdcf_name_by_default; bool _write_kdms_to_disk; bool _email_kdms; dcp::Formulation _default_kdm_type; RoughDuration _default_kdm_duration; double _auto_crop_threshold; + boost::optional _last_release_notes_version; + boost::optional _main_divider_sash_position; + boost::optional _main_content_divider_sash_position; + DefaultAddFileLocation _default_add_file_location; + bool _allow_smpte_bv20; + int _isdcf_name_part_length; + +#ifdef DCPOMATIC_GROK + boost::optional _grok; +#endif + + ExportConfig _export; static int const _current_version; @@ -1342,4 +1499,5 @@ private: static Config* _instance; }; + #endif