X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=1662671249209ec4abc60ce070351de6bdcb8da3;hp=1d0501ce4d7487d1b61a9ec980f2bcd312c1d0de;hb=29f84e2b8785585885e0658bdf9938967547460f;hpb=6bfda50f36b35a6635e9da7a25f84319ca29d92f diff --git a/src/lib/config.h b/src/lib/config.h index 1d0501ce4..166267124 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -25,14 +25,13 @@ #ifndef DCPOMATIC_CONFIG_H #define DCPOMATIC_CONFIG_H -#include "isdcf_metadata.h" #include "types.h" #include "state.h" -#include "edid.h" +#include "audio_mapping.h" #include #include #include -#include +#include #include #include #include @@ -43,6 +42,7 @@ class Ratio; class Cinema; class Film; class DKDMGroup; +class DKDMRecipient; /** @class Config * @brief A singleton class holding configuration. @@ -75,16 +75,15 @@ public: USE_ANY_SERVERS, SERVERS, CINEMAS, + DKDM_RECIPIENTS, SOUND, SOUND_OUTPUT, - INTERFACE_COMPLEXITY, PLAYER_CONTENT_DIRECTORY, PLAYER_PLAYLIST_DIRECTORY, PLAYER_DEBUG_LOG, HISTORY, -#ifdef DCPOMATIC_VARIANT_SWAROOP - PLAYER_BACKGROUND_IMAGE, -#endif + SHOW_EXPERIMENTAL_AUDIO_PROCESSORS, + AUDIO_MAPPING, OTHER }; @@ -141,13 +140,12 @@ public: return _tms_password; } - /** @return The cinema sound processor that we are using */ - CinemaSoundProcessor const * cinema_sound_processor () const { - return _cinema_sound_processor; + std::list > cinemas () const { + return _cinemas; } - std::list > cinemas () const { - return _cinemas; + std::list > dkdm_recipients () const { + return _dkdm_recipients; } std::list allowed_dcp_frame_rates () const { @@ -162,8 +160,8 @@ public: return _allow_any_container; } - ISDCFMetadata default_isdcf_metadata () const { - return _default_isdcf_metadata; + bool show_experimental_audio_processors () const { + return _show_experimental_audio_processors; } boost::optional language () const { @@ -178,10 +176,6 @@ 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; } @@ -198,6 +192,22 @@ public: return _dcp_creator; } + std::string dcp_company_name () const { + return _dcp_company_name; + } + + std::string dcp_product_name () const { + return _dcp_product_name; + } + + std::string dcp_product_version () const { + return _dcp_product_version; + } + + std::string dcp_j2k_comment () const { + return _dcp_j2k_comment; + } + int default_j2k_bandwidth () const { return _default_j2k_bandwidth; } @@ -210,8 +220,8 @@ public: return _default_interop; } - bool default_upload_after_make_dcp () { - return _default_upload_after_make_dcp; + bool upload_after_make_dcp () { + return _upload_after_make_dcp; } void set_default_kdm_directory (boost::filesystem::path d) { @@ -286,11 +296,11 @@ public: return _notification_email; } - boost::shared_ptr signer_chain () const { + std::shared_ptr signer_chain () const { return _signer_chain; } - boost::shared_ptr decryption_chain () const { + std::shared_ptr decryption_chain () const { return _decryption_chain; } @@ -332,7 +342,7 @@ public: return _player_history; } - boost::shared_ptr dkdms () const { + std::shared_ptr dkdms () const { return _dkdms; } @@ -340,6 +350,10 @@ public: return _cinemas_file; } + boost::filesystem::path dkdm_recipients_file () const { + return _dkdm_recipients_file; + } + bool show_hints_before_make_dcp () const { return _show_hints_before_make_dcp; } @@ -356,6 +370,10 @@ public: return _kdm_filename_format; } + dcp::NameFormat dkdm_filename_format () const { + return _dkdm_filename_format; + } + dcp::NameFormat dcp_metadata_filename_format () const { return _dcp_metadata_filename_format; } @@ -368,15 +386,18 @@ public: return _jump_to_selected; } + /* This could be an enum class but we use the enum a lot to index _nagged + * so it means a lot of casts. + */ enum Nag { NAG_DKDM_CONFIG, NAG_ENCRYPTED_METADATA, 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_DELETE_DKDM, + NAG_32_ON_64, + NAG_TOO_MANY_DROPPED_FRAMES, NAG_COUNT }; @@ -465,19 +486,10 @@ public: return _gdc_password; } - enum Interface { - INTERFACE_SIMPLE, - INTERFACE_FULL - }; - - Interface interface_complexity () const { - return _interface_complexity; - } - enum PlayerMode { - PLAYER_MODE_WINDOW, - PLAYER_MODE_FULL, - PLAYER_MODE_DUAL + PLAYER_MODE_WINDOW, ///< one window containing image and controls + PLAYER_MODE_FULL, ///< just the image filling the screen + PLAYER_MODE_DUAL ///< image on one monitor and extended controls on the other }; PlayerMode player_mode () const { @@ -488,6 +500,15 @@ public: return _image_display; } + enum VideoViewType { + VIDEO_VIEW_SIMPLE, + VIDEO_VIEW_OPENGL + }; + + VideoViewType video_view_type () const { + return _video_view_type; + } + bool respect_kdm_validity_periods () const { return _respect_kdm_validity_periods; } @@ -512,36 +533,12 @@ public: return _player_kdm_directory; } -#ifdef DCPOMATIC_VARIANT_SWAROOP - boost::optional player_background_image () const { - return _player_background_image; - } - - std::string kdm_server_url () const { - return _kdm_server_url; - } - - std::string player_watermark_theatre () const { - return _player_watermark_theatre; - } - - int player_watermark_period () const { - return _player_watermark_period; - } + AudioMapping audio_mapping (int output_channels); - int player_watermark_duration () const { - return _player_watermark_duration; + std::vector custom_languages () const { + return _custom_languages; } - std::vector required_monitors () const { - return _required_monitors; - } - - boost::optional player_lock_file () const { - return _player_lock_file; - } -#endif - /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -593,16 +590,26 @@ public: maybe_set (_tms_password, p); } - void add_cinema (boost::shared_ptr c) { + void add_cinema (std::shared_ptr c) { _cinemas.push_back (c); changed (CINEMAS); } - void remove_cinema (boost::shared_ptr c) { + void remove_cinema (std::shared_ptr c) { _cinemas.remove (c); changed (CINEMAS); } + void add_dkdm_recipient (std::shared_ptr c) { + _dkdm_recipients.push_back (c); + changed (DKDM_RECIPIENTS); + } + + void remove_dkdm_recipient (std::shared_ptr c) { + _dkdm_recipients.remove (c); + changed (DKDM_RECIPIENTS); + } + void set_allowed_dcp_frame_rates (std::list const & r) { maybe_set (_allowed_dcp_frame_rates, r); } @@ -615,8 +622,8 @@ public: maybe_set (_allow_any_container, a); } - void set_default_isdcf_metadata (ISDCFMetadata d) { - maybe_set (_default_isdcf_metadata, d); + void set_show_experimental_audio_processors (bool e) { + maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS); } void set_language (std::string l) { @@ -644,10 +651,6 @@ 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); } @@ -664,6 +667,22 @@ public: maybe_set (_dcp_creator, c); } + void set_dcp_company_name (std::string c) { + maybe_set (_dcp_company_name, c); + } + + void set_dcp_product_name (std::string c) { + maybe_set (_dcp_product_name, c); + } + + void set_dcp_product_version (std::string c) { + maybe_set (_dcp_product_version, c); + } + + void set_dcp_j2k_comment (std::string c) { + maybe_set (_dcp_j2k_comment, c); + } + void set_default_j2k_bandwidth (int b) { maybe_set (_default_j2k_bandwidth, b); } @@ -676,8 +695,8 @@ 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_upload_after_make_dcp (bool u) { + maybe_set (_upload_after_make_dcp, u); } void set_mail_server (std::string s) { @@ -748,11 +767,11 @@ public: void reset_notification_email (); - void set_signer_chain (boost::shared_ptr s) { + void set_signer_chain (std::shared_ptr s) { maybe_set (_signer_chain, s); } - void set_decryption_chain (boost::shared_ptr c) { + void set_decryption_chain (std::shared_ptr c) { maybe_set (_decryption_chain, c); } @@ -789,13 +808,15 @@ public: } #endif - void set_dkdms (boost::shared_ptr dkdms) { + void set_dkdms (std::shared_ptr dkdms) { _dkdms = dkdms; changed (); } void set_cinemas_file (boost::filesystem::path file); + void set_dkdm_recipients_file (boost::filesystem::path file); + void set_show_hints_before_make_dcp (bool s) { maybe_set (_show_hints_before_make_dcp, s); } @@ -841,6 +862,10 @@ public: maybe_set (_kdm_filename_format, n); } + void set_dkdm_filename_format (dcp::NameFormat n) { + maybe_set (_dkdm_filename_format, n); + } + void set_dcp_metadata_filename_format (dcp::NameFormat n) { maybe_set (_dcp_metadata_filename_format, n); } @@ -942,10 +967,6 @@ public: maybe_set (_gdc_password, boost::optional()); } - void set_interface_complexity (Interface i) { - maybe_set (_interface_complexity, i, INTERFACE_COMPLEXITY); - } - void set_player_mode (PlayerMode m) { maybe_set (_player_mode, m); } @@ -954,6 +975,10 @@ public: maybe_set (_image_display, n); } + void set_video_view_type (VideoViewType v) { + maybe_set (_video_view_type, v); + } + void set_respect_kdm_validity_periods (bool r) { maybe_set (_respect_kdm_validity_periods, r); } @@ -1018,51 +1043,10 @@ public: changed (); } -#ifdef DCPOMATIC_VARIANT_SWAROOP - void set_player_background_image (boost::filesystem::path p) { - maybe_set (_player_background_image, p, PLAYER_BACKGROUND_IMAGE); - } + void set_audio_mapping (AudioMapping m); + void set_audio_mapping_to_default (); - void unset_player_background_image () { - if (!_player_background_image) { - return; - } - _player_background_image = boost::none; - changed (PLAYER_BACKGROUND_IMAGE); - } - - void set_kdm_server_url (std::string s) { - maybe_set (_kdm_server_url, s); - } - - void set_player_watermark_theatre (std::string p) { - maybe_set (_player_watermark_theatre, p); - } - - void set_player_watermark_period (int minutes) { - maybe_set (_player_watermark_period, minutes); - } - - void set_player_watermark_duration (int milliseconds) { - maybe_set (_player_watermark_duration, milliseconds); - } - - void set_required_monitors (std::vector monitors) { - maybe_set (_required_monitors, monitors); - } - - void set_player_lock_file (boost::filesystem::path p) { - maybe_set (_player_lock_file, p); - } - - void unset_player_lock_file () { - if (!_player_lock_file) { - return; - } - _player_lock_file = boost::none; - changed (); - } -#endif + void add_custom_language (dcp::LanguageTag tag); void changed (Property p = OTHER); boost::signals2::signal Changed; @@ -1072,19 +1056,26 @@ public: 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 bad certificate in the signer chain. Handler can call - * true to ask Config to re-create the chain. + /** Emitted if there is a something wrong the contents of our config. Handler can call + * true to ask Config to solve the problem (by discarding and recreating the bad thing) */ - static boost::signals2::signal BadSignerChain; + enum BadReason { + BAD_SIGNER_UTF8_STRINGS, ///< signer chain contains UTF-8 strings (not PRINTABLESTRING) + BAD_SIGNER_INCONSISTENT, ///< signer chain is somehow inconsistent + BAD_DECRYPTION_INCONSISTENT, ///< KDM decryption chain is somehow inconsistent + }; + + static boost::signals2::signal Bad; void write () const; void write_config () const; void write_cinemas () const; + void write_dkdm_recipients () const; void link (boost::filesystem::path new_file) const; void copy_and_link (boost::filesystem::path new_file) const; bool have_write_permission () const; - void save_template (boost::shared_ptr film, std::string name) const; + void save_template (std::shared_ptr film, std::string name) const; bool existing_template (std::string name) const; std::list templates () const; boost::filesystem::path template_path (std::string name) const; @@ -1105,7 +1096,8 @@ private: void set_notification_email_to_default (); void set_cover_sheet_to_default (); void read_cinemas (cxml::Document const & f); - boost::shared_ptr create_certificate_chain (); + 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); @@ -1153,8 +1145,6 @@ private: std::string _tms_user; /** Password to log into the TMS with */ 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 */ @@ -1164,17 +1154,20 @@ private: https://www.dcpomatic.com/forum/viewtopic.php?f=2&t=1119&p=4468 */ bool _allow_any_container; - /** Default ISDCF metadata for newly-created Films */ - ISDCFMetadata _default_isdcf_metadata; + /** 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; - Ratio const * _default_scale_to; DCPContentType const * _default_dcp_content_type; int _default_dcp_audio_channels; std::string _dcp_issuer; std::string _dcp_creator; + std::string _dcp_company_name; + std::string _dcp_product_name; + std::string _dcp_product_version; + std::string _dcp_j2k_comment; int _default_j2k_bandwidth; int _default_audio_delay; bool _default_interop; @@ -1182,8 +1175,9 @@ private: the home directory will be offered. */ boost::optional _default_kdm_directory; - bool _default_upload_after_make_dcp; - std::list > _cinemas; + bool _upload_after_make_dcp; + std::list > _cinemas; + std::list > _dkdm_recipients; std::string _mail_server; int _mail_port; EmailProtocol _mail_protocol; @@ -1200,17 +1194,11 @@ private: std::vector _notification_cc; std::string _notification_bcc; std::string _notification_email; - boost::shared_ptr _signer_chain; -#ifdef DCPOMATIC_VARIANT_SWAROOP - boost::filesystem::path _signer_chain_path; -#endif + std::shared_ptr _signer_chain; /** 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 + std::shared_ptr _decryption_chain; /** true to check for updates on startup */ bool _check_for_updates; bool _check_for_test_updates; @@ -1224,11 +1212,13 @@ private: #endif std::vector _history; std::vector _player_history; - boost::shared_ptr _dkdms; + std::shared_ptr _dkdms; boost::filesystem::path _cinemas_file; + boost::filesystem::path _dkdm_recipients_file; bool _show_hints_before_make_dcp; bool _confirm_kdm_email; dcp::NameFormat _kdm_filename_format; + dcp::NameFormat _dkdm_filename_format; dcp::NameFormat _kdm_container_name_format; dcp::NameFormat _dcp_metadata_filename_format; dcp::NameFormat _dcp_asset_filename_format; @@ -1251,9 +1241,9 @@ private: boost::optional _christie_password; boost::optional _gdc_username; boost::optional _gdc_password; - Interface _interface_complexity; PlayerMode _player_mode; int _image_display; + VideoViewType _video_view_type; bool _respect_kdm_validity_periods; /** Log file containing things the player does (e.g. started, stopped, loaded playlist etc.) Does not contain debugging information. @@ -1268,18 +1258,8 @@ private: boost::optional _player_content_directory; boost::optional _player_playlist_directory; boost::optional _player_kdm_directory; -#ifdef DCPOMATIC_VARIANT_SWAROOP - boost::optional _player_background_image; - std::string _kdm_server_url; - std::string _player_watermark_theatre; - /** watermark period in minutes */ - int _player_watermark_period; - /** watermark duration in milliseconds */ - int _player_watermark_duration; - std::vector _required_monitors; - /** a file which, if specified, must be present for the player to work */ - boost::optional _player_lock_file; -#endif + boost::optional _audio_mapping; + std::vector _custom_languages; static int const _current_version;