X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=1a11b4a411635e1b550cdb5e78d32e36121843db;hb=d85bd416c6267e9c86948b9b5f2e5dba5e67f755;hp=e9b3ec203af95e762f6271ef66aa501f36ab5a1d;hpb=b915348a8288d68e2ff114fb3dd89ad22e699969;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index e9b3ec203..1a11b4a41 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 }; @@ -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; } @@ -567,6 +578,25 @@ public: 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; + } + + 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; + } /* SET (mostly) */ @@ -651,6 +681,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); } @@ -1088,12 +1126,45 @@ public: 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 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 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 @@ -1133,21 +1204,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) { @@ -1166,6 +1222,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 */ @@ -1199,6 +1273,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; @@ -1307,6 +1383,13 @@ private: 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; + + ExportConfig _export; static int const _current_version; @@ -1314,4 +1397,5 @@ private: static Config* _instance; }; + #endif