X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=b6a1a535d08e10f53db404d4e4b94bb4e28f8d08;hb=98a10c9874d28e2e52f7495549b80528372ffbfb;hp=c6bf5986bc7626de1bbbf37aec4ec26755b9d645;hpb=4d879e836147720bed8208f92d8d39bcbd661221;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index c6bf5986b..b6a1a535d 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -31,7 +31,6 @@
 #include "export_config.h"
 #include "rough_duration.h"
 #include "state.h"
-#include "types.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
@@ -242,6 +241,10 @@ public:
 		return _default_audio_language;
 	}
 
+	boost::optional<dcp::LanguageTag::RegionSubtag> default_territory() const {
+		return _default_territory;
+	}
+
 	std::map<std::string, std::string> default_metadata () const {
 		return _default_metadata;
 	}
@@ -562,9 +565,7 @@ public:
 		return _custom_languages;
 	}
 
-	boost::optional<boost::filesystem::path> add_files_path () const {
-		return _add_files_path;
-	}
+	boost::optional<boost::filesystem::path> initial_path(std::string id) const;
 
 	bool use_isdcf_name_by_default () const {
 		return _use_isdcf_name_by_default;
@@ -774,6 +775,14 @@ public:
 		maybe_set(_default_audio_language, boost::optional<dcp::LanguageTag>());
 	}
 
+	void set_default_territory(dcp::LanguageTag::RegionSubtag tag) {
+		maybe_set(_default_territory, tag);
+	}
+
+	void unset_default_territory() {
+		maybe_set(_default_territory, boost::optional<dcp::LanguageTag::RegionSubtag>());
+	}
+
 	void set_default_metadata (std::map<std::string, std::string> const& metadata) {
 		maybe_set (_default_metadata, metadata);
 	}
@@ -1117,10 +1126,7 @@ public:
 
 	void add_custom_language (dcp::LanguageTag tag);
 
-	void set_add_files_path (boost::filesystem::path p) {
-		_add_files_path = p;
-		changed ();
-	}
+	void set_initial_path(std::string id, boost::filesystem::path path);
 
 	void set_use_isdcf_name_by_default (bool use) {
 		maybe_set (_use_isdcf_name_by_default, use);
@@ -1305,6 +1311,7 @@ private:
 	int _default_audio_delay;
 	bool _default_interop;
 	boost::optional<dcp::LanguageTag> _default_audio_language;
+	boost::optional<dcp::LanguageTag::RegionSubtag> _default_territory;
 	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.
@@ -1391,7 +1398,7 @@ private:
 	boost::optional<boost::filesystem::path> _player_kdm_directory;
 	boost::optional<AudioMapping> _audio_mapping;
 	std::vector<dcp::LanguageTag> _custom_languages;
-	boost::optional<boost::filesystem::path> _add_files_path;
+	std::map<std::string, boost::optional<boost::filesystem::path>> _initial_paths;
 	bool _use_isdcf_name_by_default;
 	bool _write_kdms_to_disk;
 	bool _email_kdms;