X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=8fbdeaf9584ffe9f9aa85c9084b2fd867aa80bb9;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=ec152b969dbee98530628f1a274c0b48725764b5;hpb=d9338a75602429347e36e5b393728c10cda731b3;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index ec152b969..8fbdeaf95 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -28,6 +28,8 @@ #include "audio_mapping.h" +#include "export_config.h" +#include "rough_duration.h" #include "state.h" #include "types.h" #include @@ -91,6 +93,7 @@ public: HISTORY, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS, AUDIO_MAPPING, + AUTO_CROP_THRESHOLD, OTHER }; @@ -147,11 +150,11 @@ public: return _tms_password; } - std::list > cinemas () const { + std::list> cinemas () const { return _cinemas; } - std::list > dkdm_recipients () const { + std::list> dkdm_recipients () const { return _dkdm_recipients; } @@ -167,6 +170,14 @@ public: return _allow_any_container; } + bool allow_96khz_audio () const { + 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; } @@ -563,6 +574,22 @@ public: return _email_kdms; } + dcp::Formulation default_kdm_type () const { + return _default_kdm_type; + } + + RoughDuration default_kdm_duration () const { + return _default_kdm_duration; + } + + double auto_crop_threshold () const { + return _auto_crop_threshold; + } + + boost::optional last_release_notes_version () const { + return _last_release_notes_version; + } + /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -646,6 +673,14 @@ public: maybe_set (_allow_any_container, a); } + void set_allow_96hhz_audio (bool a) { + 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); } @@ -1079,12 +1114,41 @@ public: maybe_set (_email_kdms, email); } + void set_default_kdm_type (dcp::Formulation type) { + maybe_set (_default_kdm_type, type); + } + + void set_default_kdm_duration (RoughDuration duration) { + maybe_set (_default_kdm_duration, duration); + } + + void set_auto_crop_threshold (double threshold) { + 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 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 @@ -1099,7 +1163,7 @@ public: static boost::signals2::signal Bad; - void write () const; + void write () const override; void write_config () const; void write_cinemas () const; void write_dkdm_recipients () const; @@ -1124,21 +1188,6 @@ public: static boost::filesystem::path config_read_file (); static boost::filesystem::path config_write_file (); -private: - Config (); - void read (); - 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) { @@ -1157,6 +1206,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 */ @@ -1190,6 +1257,8 @@ private: https://www.dcpomatic.com/forum/viewtopic.php?f=2&t=1119&p=4468 */ 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; @@ -1213,8 +1282,8 @@ private: */ boost::optional _default_kdm_directory; bool _upload_after_make_dcp; - std::list > _cinemas; - std::list > _dkdm_recipients; + std::list> _cinemas; + std::list> _dkdm_recipients; std::string _mail_server; int _mail_port; EmailProtocol _mail_protocol; @@ -1297,6 +1366,12 @@ private: 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; + + ExportConfig _export; static int const _current_version; @@ -1304,4 +1379,5 @@ private: static Config* _instance; }; + #endif