X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=5db5cf35fe3145f14bf1653bc2c416e0d63491b8;hb=2eb7ac323df51a65df1a7cf856058fb4cf0bc020;hp=235bace7b78f6b9c62cc30e450ee9c0a233c747e;hpb=da822af56c5e4acab361b8531fb75a1dcb4b110e;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 235bace7b..5db5cf35f 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -23,6 +23,7 @@
 #include "colour_conversion.h"
 #include "compose.hpp"
 #include "config.h"
+#include "constants.h"
 #include "cross.h"
 #include "crypto.h"
 #include "dcp_content_type.h"
@@ -32,8 +33,6 @@
 #include "filter.h"
 #include "log.h"
 #include "ratio.h"
-#include "types.h"
-#include "util.h"
 #include "zipper.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/name_format.h>
@@ -186,7 +185,10 @@ Config::set_defaults ()
 	_player_kdm_directory = boost::none;
 	_audio_mapping = boost::none;
 	_custom_languages.clear ();
-	_add_files_path = boost::none;
+	_initial_paths.clear();
+	_initial_paths["AddFilesPath"] = boost::none;
+	_initial_paths["AddDKDMPath"] = boost::none;
+	_initial_paths["SelectCertificatePath"] = boost::none;
 	_use_isdcf_name_by_default = true;
 	_write_kdms_to_disk = true;
 	_email_kdms = false;
@@ -358,6 +360,20 @@ try
 	_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
 	_default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false);
 
+	try {
+		auto al = f.optional_string_child("DefaultAudioLanguage");
+		if (al) {
+			_default_audio_language = dcp::LanguageTag(*al);
+		}
+	} catch (std::runtime_error&) {}
+
+	try {
+		auto te = f.optional_string_child("DefaultTerritory");
+		if (te) {
+			_default_territory = dcp::LanguageTag::RegionSubtag(*te);
+		}
+	} catch (std::runtime_error&) {}
+
 	for (auto const& i: f.node_children("DefaultMetadata")) {
 		_default_metadata[i->string_attribute("key")] = i->content();
 	}
@@ -586,7 +602,9 @@ try
 		} catch (std::runtime_error& e) {}
 	}
 
-	_add_files_path = f.optional_string_child("AddFilesPath");
+	for (auto& initial: _initial_paths) {
+		initial.second = f.optional_string_child(initial.first);
+	}
 	_use_isdcf_name_by_default = f.optional_bool_child("UseISDCFNameByDefault").get_value_or(true);
 	_write_kdms_to_disk = f.optional_bool_child("WriteKDMsToDisk").get_value_or(true);
 	_email_kdms = f.optional_bool_child("EmailKDMs").get_value_or(false);
@@ -755,6 +773,14 @@ Config::write_config () const
 	root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay));
 	/* [XML] DefaultInterop 1 to default new films to Interop, 0 for SMPTE. */
 	root->add_child("DefaultInterop")->add_child_text (_default_interop ? "1" : "0");
+	if (_default_audio_language) {
+		/* [XML] DefaultAudioLanguage Default audio language to use for new films */
+		root->add_child("DefaultAudioLanguage")->add_child_text(_default_audio_language->to_string());
+	}
+	if (_default_territory) {
+		/* [XML] DefaultTerritory Default territory to use for new films */
+		root->add_child("DefaultTerritory")->add_child_text(_default_territory->subtag());
+	}
 	for (auto const& i: _default_metadata) {
 		auto c = root->add_child("DefaultMetadata");
 		c->set_attribute("key", i.first);
@@ -1050,9 +1076,10 @@ Config::write_config () const
 	for (auto const& i: _custom_languages) {
 		root->add_child("CustomLanguage")->add_child_text(i.to_string());
 	}
-	if (_add_files_path) {
-		/* [XML] AddFilesPath The default path that will be offered in the picker when adding files to a film. */
-		root->add_child("AddFilesPath")->add_child_text(_add_files_path->string());
+	for (auto const& initial: _initial_paths) {
+		if (initial.second) {
+			root->add_child(initial.first)->add_child_text(initial.second->string());
+		}
 	}
 	root->add_child("UseISDCFNameByDefault")->add_child_text(_use_isdcf_name_by_default ? "1" : "0");
 	root->add_child("WriteKDMsToDisk")->add_child_text(_write_kdms_to_disk ? "1" : "0");
@@ -1570,3 +1597,22 @@ save_all_config_as_zip (boost::filesystem::path zip_file)
 	zipper.close ();
 }
 
+
+void
+Config::set_initial_path(string id, boost::filesystem::path path)
+{
+	auto iter = _initial_paths.find(id);
+	DCPOMATIC_ASSERT(iter != _initial_paths.end());
+	iter->second = path;
+	changed();
+}
+
+
+optional<boost::filesystem::path>
+Config::initial_path(string id) const
+{
+	auto iter = _initial_paths.find(id);
+	DCPOMATIC_ASSERT(iter != _initial_paths.end());
+	return iter->second;
+}
+