X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=44708a24fc231b561dcebe0efb84e2ade175fb9d;hb=c94d763e07d9e7b029091e1ea64ba4f7758b3d5b;hp=6baa434a32fd10f08ea435572cf46dd802fbcb39;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 6baa434a3..44708a24f 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,6 +27,7 @@
 
 #include "isdcf_metadata.h"
 #include "types.h"
+#include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/shared_ptr.hpp>
@@ -38,6 +39,8 @@ class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
 class Cinema;
+class Film;
+class DKDMGroup;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -45,20 +48,33 @@ class Cinema;
 class Config : public boost::noncopyable
 {
 public:
-	/** @return number of threads to use for J2K encoding on the local machine */
-	int num_local_encoding_threads () const {
-		return _num_local_encoding_threads;
+	/** @return number of threads which a master DoM should use for J2K encoding on the local machine */
+	int master_encoding_threads () const {
+		return _master_encoding_threads;
 	}
 
-	boost::filesystem::path default_directory () const {
+	/** @return number of threads which a server should use for J2K encoding on the local machine */
+	int server_encoding_threads () const {
+		return _server_encoding_threads;
+	}
+
+	boost::optional<boost::filesystem::path> default_directory () const {
 		return _default_directory;
 	}
 
+	boost::optional<boost::filesystem::path> default_kdm_directory () const {
+		return _default_kdm_directory;
+	}
+
 	boost::filesystem::path default_directory_or (boost::filesystem::path a) const;
+	boost::filesystem::path default_kdm_directory_or (boost::filesystem::path a) const;
 
 	enum Property {
 		USE_ANY_SERVERS,
 		SERVERS,
+		CINEMAS,
+		PREVIEW_SOUND,
+		PREVIEW_SOUND_OUTPUT,
 		OTHER
 	};
 
@@ -148,10 +164,18 @@ 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;
 	}
 
+	int default_dcp_audio_channels () const {
+		return _default_dcp_audio_channels;
+	}
+
 	std::string dcp_issuer () const {
 		return _dcp_issuer;
 	}
@@ -172,6 +196,14 @@ public:
 		return _default_interop;
 	}
 
+	void set_default_kdm_directory (boost::filesystem::path d) {
+		if (_default_kdm_directory && _default_kdm_directory.get() == d) {
+			return;
+		}
+		_default_kdm_directory = d;
+		changed ();
+	}
+
 	std::string mail_server () const {
 		return _mail_server;
 	}
@@ -250,7 +282,7 @@ public:
 		return _history;
 	}
 
-	std::vector<dcp::EncryptedKDM> dkdms () const {
+	boost::shared_ptr<DKDMGroup> dkdms () const {
 		return _dkdms;
 	}
 
@@ -258,13 +290,70 @@ public:
 		return _cinemas_file;
 	}
 
-	/** @param n New number of local encoding threads */
-	void set_num_local_encoding_threads (int n) {
-		maybe_set (_num_local_encoding_threads, n);
+	bool show_hints_before_make_dcp () const {
+		return _show_hints_before_make_dcp;
+	}
+
+	bool confirm_kdm_email () const {
+		return _confirm_kdm_email;
+	}
+
+	dcp::NameFormat kdm_container_name_format () const {
+		return _kdm_container_name_format;
+	}
+
+	dcp::NameFormat kdm_filename_format () const {
+		return _kdm_filename_format;
+	}
+
+	dcp::NameFormat dcp_metadata_filename_format () const {
+		return _dcp_metadata_filename_format;
+	}
+
+	dcp::NameFormat dcp_asset_filename_format () const {
+		return _dcp_asset_filename_format;
+	}
+
+	bool jump_to_selected () const {
+		return _jump_to_selected;
+	}
+
+	enum Nag {
+		NAG_DKDM_CONFIG,
+		NAG_ENCRYPTED_METADATA,
+		NAG_COUNT
+	};
+
+	bool nagged (Nag nag) const {
+		return _nagged[nag];
+	}
+
+	bool preview_sound () const {
+		return _preview_sound;
+	}
+
+	std::string cover_sheet () const {
+		return _cover_sheet;
+	}
+
+	boost::optional<std::string> preview_sound_output () const {
+		return _preview_sound_output;
+	}
+
+	void set_master_encoding_threads (int n) {
+		maybe_set (_master_encoding_threads, n);
+	}
+
+	void set_server_encoding_threads (int n) {
+		maybe_set (_server_encoding_threads, n);
 	}
 
 	void set_default_directory (boost::filesystem::path d) {
-		maybe_set (_default_directory, d);
+		if (_default_directory && *_default_directory == d) {
+			return;
+		}
+		_default_directory = d;
+		changed ();
 	}
 
 	/** @param p New server port */
@@ -302,12 +391,12 @@ public:
 
 	void add_cinema (boost::shared_ptr<Cinema> c) {
 		_cinemas.push_back (c);
-		changed ();
+		changed (CINEMAS);
 	}
 
 	void remove_cinema (boost::shared_ptr<Cinema> c) {
 		_cinemas.remove (c);
-		changed ();
+		changed (CINEMAS);
 	}
 
 	void set_allowed_dcp_frame_rates (std::list<int> const & r) {
@@ -347,10 +436,18 @@ 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);
 	}
 
+	void set_default_dcp_audio_channels (int c) {
+		maybe_set (_default_dcp_audio_channels, c);
+	}
+
 	void set_dcp_issuer (std::string i) {
 		maybe_set (_dcp_issuer, i);
 	}
@@ -450,14 +547,56 @@ public:
 	}
 #endif
 
-	void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms)
-	{
+	void set_dkdms (boost::shared_ptr<DKDMGroup> dkdms) {
 		_dkdms = dkdms;
 		changed ();
 	}
 
 	void set_cinemas_file (boost::filesystem::path file);
 
+	void set_show_hints_before_make_dcp (bool s) {
+		maybe_set (_show_hints_before_make_dcp, s);
+	}
+
+	void set_confirm_kdm_email (bool s) {
+		maybe_set (_confirm_kdm_email, s);
+	}
+
+	void set_preview_sound (bool s) {
+		maybe_set (_preview_sound, s, PREVIEW_SOUND);
+	}
+
+	void set_preview_sound_output (std::string o)
+	{
+		maybe_set (_preview_sound_output, o, PREVIEW_SOUND_OUTPUT);
+	}
+
+	void unset_preview_sound_output ()
+	{
+		if (!_preview_sound_output) {
+			return;
+		}
+
+		_preview_sound_output = boost::none;
+		changed ();
+	}
+
+	void set_kdm_container_name_format (dcp::NameFormat n) {
+		maybe_set (_kdm_container_name_format, n);
+	}
+
+	void set_kdm_filename_format (dcp::NameFormat n) {
+		maybe_set (_kdm_filename_format, n);
+	}
+
+	void set_dcp_metadata_filename_format (dcp::NameFormat n) {
+		maybe_set (_dcp_metadata_filename_format, n);
+	}
+
+	void set_dcp_asset_filename_format (dcp::NameFormat n) {
+		maybe_set (_dcp_asset_filename_format, n);
+	}
+
 	void clear_history () {
 		_history.clear ();
 		changed ();
@@ -465,15 +604,43 @@ public:
 
 	void add_to_history (boost::filesystem::path p);
 
+	void set_jump_to_selected (bool j) {
+		maybe_set (_jump_to_selected, j);
+	}
+
+	void set_nagged (Nag nag, bool nagged) {
+		maybe_set (_nagged[nag], nagged);
+	}
+
+	void set_cover_sheet (std::string s) {
+		maybe_set (_cover_sheet, s);
+	}
+
+	void reset_cover_sheet ();
+
 	void changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> 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<void ()> FailedToLoad;
 
 	void write () const;
+	void write_config () const;
+	void write_cinemas () const;
+
+	void save_template (boost::shared_ptr<const Film> film, std::string name) const;
+	bool existing_template (std::string name) const;
+	std::list<std::string> templates () const;
+	boost::filesystem::path template_path (std::string name) const;
+	void rename_template (std::string old_name, std::string new_name) const;
+	void delete_template (std::string name) const;
 
 	static Config* instance ();
 	static void drop ();
 	static void restore_defaults ();
 	static bool have_existing (std::string);
+	static boost::filesystem::path config_path ();
 
 private:
 	Config ();
@@ -481,24 +648,35 @@ private:
 	void read ();
 	void set_defaults ();
 	void set_kdm_email_to_default ();
-	void write_config_xml () const;
-	void write_cinemas_xml () const;
+	void set_cover_sheet_to_default ();
 	void read_cinemas (cxml::Document const & f);
 	boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
+	boost::filesystem::path directory_or (boost::optional<boost::filesystem::path> dir, boost::filesystem::path a) const;
 
 	template <class T>
-	void maybe_set (T& member, T new_value) {
+	void maybe_set (T& member, T new_value, Property prop = OTHER) {
 		if (member == new_value) {
 			return;
 		}
 		member = new_value;
-		changed ();
+		changed (prop);
+	}
+
+	template <class T>
+	void maybe_set (boost::optional<T>& member, T new_value, Property prop = OTHER) {
+		if (member && member.get() == new_value) {
+			return;
+		}
+		member = new_value;
+		changed (prop);
 	}
 
-	/** number of threads to use for J2K encoding on the local machine */
-	int _num_local_encoding_threads;
+	/** 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 */
+	int _server_encoding_threads;
 	/** default directory to put new films in */
-	boost::filesystem::path _default_directory;
+	boost::optional<boost::filesystem::path> _default_directory;
 	/** base port number to use for J2K encoding servers;
 	 *  this port and the two above it will be used.
 	 */
@@ -528,12 +706,18 @@ private:
  	/** 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;
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	bool _default_interop;
+	/** Default directory to offer to write KDMs to; if it's not set,
+	    the home directory will be offered.
+	*/
+	boost::optional<boost::filesystem::path> _default_kdm_directory;
 	std::list<boost::shared_ptr<Cinema> > _cinemas;
 	std::string _mail_server;
 	int _mail_port;
@@ -561,8 +745,20 @@ private:
 	bool _win32_console;
 #endif
 	std::vector<boost::filesystem::path> _history;
-	std::vector<dcp::EncryptedKDM> _dkdms;
+	boost::shared_ptr<DKDMGroup> _dkdms;
 	boost::filesystem::path _cinemas_file;
+	bool _show_hints_before_make_dcp;
+	bool _confirm_kdm_email;
+	dcp::NameFormat _kdm_filename_format;
+	dcp::NameFormat _kdm_container_name_format;
+	dcp::NameFormat _dcp_metadata_filename_format;
+	dcp::NameFormat _dcp_asset_filename_format;
+	bool _jump_to_selected;
+	bool _nagged[NAG_COUNT];
+	bool _preview_sound;
+	/** name of a specific sound output stream to use for preview, or empty to use the default */
+	boost::optional<std::string> _preview_sound_output;
+	std::string _cover_sheet;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;