X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=46bd390cc8628773edd0e476781c099f016c794f;hp=74a44bc2f8d9b57bf2c5dd8a6248046c7aacaafe;hb=924f4edb20d14bc697956254951fb87513cf2e19;hpb=54ca5a01f0648d2a5101fab0f50b41d8c90612e4 diff --git a/src/lib/config.h b/src/lib/config.h index 74a44bc2f..46bd390cc 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -25,15 +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 @@ -80,16 +78,12 @@ public: DKDM_RECIPIENTS, SOUND, SOUND_OUTPUT, - INTERFACE_COMPLEXITY, PLAYER_CONTENT_DIRECTORY, PLAYER_PLAYLIST_DIRECTORY, PLAYER_DEBUG_LOG, HISTORY, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS, AUDIO_MAPPING, -#ifdef DCPOMATIC_VARIANT_SWAROOP - PLAYER_BACKGROUND_IMAGE, -#endif OTHER }; @@ -146,11 +140,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; } @@ -170,10 +164,6 @@ public: return _show_experimental_audio_processors; } - ISDCFMetadata default_isdcf_metadata () const { - return _default_isdcf_metadata; - } - boost::optional language () const { return _language; } @@ -230,6 +220,10 @@ public: return _default_interop; } + std::map default_metadata () const { + return _default_metadata; + } + bool upload_after_make_dcp () { return _upload_after_make_dcp; } @@ -306,11 +300,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; } @@ -352,7 +346,7 @@ public: return _player_history; } - boost::shared_ptr dkdms () const { + std::shared_ptr dkdms () const { return _dkdms; } @@ -396,16 +390,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 }; @@ -494,15 +490,6 @@ public: return _gdc_password; } - enum Interface { - INTERFACE_SIMPLE, - INTERFACE_FULL - }; - - Interface interface_complexity () const { - return _interface_complexity; - } - enum PlayerMode { PLAYER_MODE_WINDOW, ///< one window containing image and controls PLAYER_MODE_FULL, ///< just the image filling the screen @@ -552,36 +539,14 @@ public: AudioMapping audio_mapping (int output_channels); -#ifdef DCPOMATIC_VARIANT_SWAROOP - boost::optional player_background_image () const { - return _player_background_image; + std::vector custom_languages () const { + return _custom_languages; } - std::string kdm_server_url () const { - return _kdm_server_url; + boost::optional add_files_path () const { + return _add_files_path; } - std::string player_watermark_theatre () const { - return _player_watermark_theatre; - } - - int player_watermark_period () const { - return _player_watermark_period; - } - - int player_watermark_duration () const { - return _player_watermark_duration; - } - - 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) { @@ -633,22 +598,22 @@ 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 (boost::shared_ptr c) { + void add_dkdm_recipient (std::shared_ptr c) { _dkdm_recipients.push_back (c); changed (DKDM_RECIPIENTS); } - void remove_dkdm_recipient (boost::shared_ptr c) { + void remove_dkdm_recipient (std::shared_ptr c) { _dkdm_recipients.remove (c); changed (DKDM_RECIPIENTS); } @@ -669,10 +634,6 @@ public: maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS); } - void set_default_isdcf_metadata (ISDCFMetadata d) { - maybe_set (_default_isdcf_metadata, d); - } - void set_language (std::string l) { if (_language && _language.get() == l) { return; @@ -742,6 +703,10 @@ public: maybe_set (_default_interop, i); } + void set_default_metadata (std::map const& metadata) { + maybe_set (_default_metadata, metadata); + } + void set_upload_after_make_dcp (bool u) { maybe_set (_upload_after_make_dcp, u); } @@ -814,11 +779,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); } @@ -855,7 +820,7 @@ public: } #endif - void set_dkdms (boost::shared_ptr dkdms) { + void set_dkdms (std::shared_ptr dkdms) { _dkdms = dkdms; changed (); } @@ -1014,10 +979,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); } @@ -1097,51 +1058,12 @@ public: void set_audio_mapping (AudioMapping m); void set_audio_mapping_to_default (); -#ifdef DCPOMATIC_VARIANT_SWAROOP - void set_player_background_image (boost::filesystem::path p) { - maybe_set (_player_background_image, p, PLAYER_BACKGROUND_IMAGE); - } - - 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 add_custom_language (dcp::LanguageTag tag); - 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; + void set_add_files_path (boost::filesystem::path p) { + _add_files_path = p; changed (); } -#endif void changed (Property p = OTHER); boost::signals2::signal Changed; @@ -1170,7 +1092,7 @@ public: 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; @@ -1192,7 +1114,7 @@ private: void set_cover_sheet_to_default (); void read_cinemas (cxml::Document const & f); void read_dkdm_recipients (cxml::Document const & f); - boost::shared_ptr create_certificate_chain (); + 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); @@ -1251,8 +1173,6 @@ private: bool _allow_any_container; /** Offer the upmixers in the audio processor settings */ bool _show_experimental_audio_processors; - /** Default ISDCF metadata for newly-created Films */ - ISDCFMetadata _default_isdcf_metadata; boost::optional _language; /** Default length of still image content (seconds) */ int _default_still_length; @@ -1268,13 +1188,14 @@ private: int _default_j2k_bandwidth; int _default_audio_delay; bool _default_interop; + std::map _default_metadata; /** Default directory to offer to write KDMs to; if it's not set, the home directory will be offered. */ 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; @@ -1291,17 +1212,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; @@ -1315,7 +1230,7 @@ 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; @@ -1344,7 +1259,6 @@ 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; @@ -1363,18 +1277,8 @@ private: boost::optional _player_playlist_directory; boost::optional _player_kdm_directory; boost::optional _audio_mapping; -#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 + std::vector _custom_languages; + boost::optional _add_files_path; static int const _current_version;