X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=46bd390cc8628773edd0e476781c099f016c794f;hb=2e2f11b29651cffe37c64275dbd45c7563310020;hp=0a48a00e1dfc8a71ac66e77ca26a07d73610e2c4;hpb=a7a8cd74f2f32de8b708c78cc8bc9c0cf17d60f5;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 0a48a00e1..46bd390cc 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 <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
@@ -166,10 +164,6 @@ public:
 		return _show_experimental_audio_processors;
 	}
 
-	ISDCFMetadata default_isdcf_metadata () const {
-		return _default_isdcf_metadata;
-	}
-
 	boost::optional<std::string> language () const {
 		return _language;
 	}
@@ -226,6 +220,10 @@ public:
 		return _default_interop;
 	}
 
+	std::map<std::string, std::string> default_metadata () const {
+		return _default_metadata;
+	}
+
 	bool upload_after_make_dcp () {
 		return _upload_after_make_dcp;
 	}
@@ -541,14 +539,14 @@ public:
 
 	AudioMapping audio_mapping (int output_channels);
 
-	int minimum_frame_size () const {
-		return _minimum_frame_size;
-	}
-
 	std::vector<dcp::LanguageTag> custom_languages () const {
 		return _custom_languages;
 	}
 
+	boost::optional<boost::filesystem::path> add_files_path () const {
+		return _add_files_path;
+	}
+
 	/* SET (mostly) */
 
 	void set_master_encoding_threads (int n) {
@@ -636,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;
@@ -709,6 +703,10 @@ public:
 		maybe_set (_default_interop, i);
 	}
 
+	void set_default_metadata (std::map<std::string, std::string> const& metadata) {
+		maybe_set (_default_metadata, metadata);
+	}
+
 	void set_upload_after_make_dcp (bool u) {
 		maybe_set (_upload_after_make_dcp, u);
 	}
@@ -1060,12 +1058,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<void (Property)> Changed;
 	/** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1174,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<std::string> _language;
  	/** Default length of still image content (seconds) */
 	int _default_still_length;
@@ -1191,6 +1188,7 @@ private:
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	bool _default_interop;
+	std::map<std::string, std::string> _default_metadata;
 	/** Default directory to offer to write KDMs to; if it's not set,
 	    the home directory will be offered.
 	*/
@@ -1279,8 +1277,8 @@ private:
 	boost::optional<boost::filesystem::path> _player_playlist_directory;
 	boost::optional<boost::filesystem::path> _player_kdm_directory;
 	boost::optional<AudioMapping> _audio_mapping;
-	int _minimum_frame_size;
 	std::vector<dcp::LanguageTag> _custom_languages;
+	boost::optional<boost::filesystem::path> _add_files_path;
 
 	static int const _current_version;