X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=19e05608c5e7a0116c7b73d62b3ecae6ca03ab67;hp=0a48a00e1dfc8a71ac66e77ca26a07d73610e2c4;hb=cfbe9d2f44e380efed7a61b5b5c7a2fec7794915;hpb=a7a8cd74f2f32de8b708c78cc8bc9c0cf17d60f5 diff --git a/src/lib/config.h b/src/lib/config.h index 0a48a00e1..19e05608c 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -25,10 +25,8 @@ #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 @@ -166,10 +164,6 @@ public: return _show_experimental_audio_processors; } - ISDCFMetadata default_isdcf_metadata () const { - return _default_isdcf_metadata; - } - boost::optional language () const { return _language; } @@ -226,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; } @@ -519,10 +517,6 @@ public: return _respect_kdm_validity_periods; } - boost::optional player_activity_log_file () const { - return _player_activity_log_file; - } - boost::optional player_debug_log_file () const { return _player_debug_log_file; } @@ -541,14 +535,14 @@ public: AudioMapping audio_mapping (int output_channels); - int minimum_frame_size () const { - return _minimum_frame_size; - } - std::vector custom_languages () const { return _custom_languages; } + boost::optional add_files_path () const { + return _add_files_path; + } + /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -636,10 +630,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; @@ -709,6 +699,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); } @@ -829,8 +823,6 @@ public: 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); } @@ -997,18 +989,6 @@ public: maybe_set (_respect_kdm_validity_periods, r); } - void set_player_activity_log_file (boost::filesystem::path p) { - maybe_set (_player_activity_log_file, p); - } - - void unset_player_activity_log_file () { - if (!_player_activity_log_file) { - return; - } - _player_activity_log_file = boost::none; - changed (); - } - void set_player_debug_log_file (boost::filesystem::path p) { maybe_set (_player_debug_log_file, p, PLAYER_DEBUG_LOG); } @@ -1060,12 +1040,13 @@ public: void set_audio_mapping (AudioMapping m); void set_audio_mapping_to_default (); - void set_minimum_frame_size (int size) { - maybe_set (_minimum_frame_size, size); - } - void add_custom_language (dcp::LanguageTag tag); + void set_add_files_path (boost::filesystem::path p) { + _add_files_path = p; + changed (); + } + void changed (Property p = OTHER); boost::signals2::signal Changed; /** Emitted if read() failed on an existing Config file. There is nothing @@ -1096,7 +1077,8 @@ public: 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; + boost::filesystem::path template_read_path (std::string name) const; + boost::filesystem::path template_write_path (std::string name) const; void rename_template (std::string old_name, std::string new_name) const; void delete_template (std::string name) const; @@ -1104,7 +1086,8 @@ public: static void drop (); static void restore_defaults (); static bool have_existing (std::string); - static boost::filesystem::path config_file (); + static boost::filesystem::path config_read_file (); + static boost::filesystem::path config_write_file (); private: Config (); @@ -1174,8 +1157,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; @@ -1191,6 +1172,7 @@ 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. */ @@ -1265,10 +1247,6 @@ private: 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. - */ - boost::optional _player_activity_log_file; /** Log file containing debug information for the player */ boost::optional _player_debug_log_file; /** A directory containing DCPs whose contents are presented to the user @@ -1279,8 +1257,8 @@ private: boost::optional _player_playlist_directory; boost::optional _player_kdm_directory; boost::optional _audio_mapping; - int _minimum_frame_size; std::vector _custom_languages; + boost::optional _add_files_path; static int const _current_version;