X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fconfig.cc;h=aea54aa237c59144553b3d508a0560f5a215c2b5;hb=b6b3ba73baff38c823405e4e849bcd093a4a9e31;hp=21e6703061cede3a1a37e24d7c8f50cdb51f301e;hpb=98a10c9874d28e2e52f7495549b80528372ffbfb;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 21e670306..aea54aa23 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -25,7 +25,6 @@
 #include "config.h"
 #include "constants.h"
 #include "cross.h"
-#include "crypto.h"
 #include "dcp_content_type.h"
 #include "dkdm_recipient.h"
 #include "dkdm_wrapper.h"
@@ -106,7 +105,7 @@ Config::set_defaults ()
 	_language = optional<string> ();
 	_default_still_length = 10;
 	_default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
-	_default_dcp_audio_channels = 6;
+	_default_dcp_audio_channels = 8;
 	_default_j2k_bandwidth = 150000000;
 	_default_audio_delay = 0;
 	_default_interop = false;
@@ -140,9 +139,9 @@ Config::set_defaults ()
 	_dkdm_recipients_file = read_path ("dkdm_recipients.xml");
 	_show_hints_before_make_dcp = true;
 	_confirm_kdm_email = true;
-	_kdm_container_name_format = dcp::NameFormat ("KDM %f %c");
-	_kdm_filename_format = dcp::NameFormat ("KDM %f %c %s");
-	_dkdm_filename_format = dcp::NameFormat ("DKDM %f %c %s");
+	_kdm_container_name_format = dcp::NameFormat("KDM_%f_%c");
+	_kdm_filename_format = dcp::NameFormat("KDM_%f_%c_%s");
+	_dkdm_filename_format = dcp::NameFormat("DKDM_%f_%c_%s");
 	_dcp_metadata_filename_format = dcp::NameFormat ("%t");
 	_dcp_asset_filename_format = dcp::NameFormat ("%t");
 	_jump_to_selected = true;
@@ -153,6 +152,7 @@ Config::set_defaults ()
 	_sound_output = optional<string> ();
 	_last_kdm_write_type = KDM_WRITE_FLAT;
 	_last_dkdm_write_type = DKDM_WRITE_INTERNAL;
+	_default_add_file_location = DefaultAddFileLocation::SAME_AS_LAST_TIME;
 
 	/* I think the scaling factor here should be the ratio of the longest frame
 	   encode time to the shortest; if the thread count is T, longest time is L
@@ -187,6 +187,10 @@ Config::set_defaults ()
 	_custom_languages.clear ();
 	_initial_paths.clear();
 	_initial_paths["AddFilesPath"] = boost::none;
+	_initial_paths["AddKDMPath"] = boost::none;
+	_initial_paths["AddDKDMPath"] = boost::none;
+	_initial_paths["SelectCertificatePath"] = boost::none;
+	_initial_paths["AddCombinerInputPath"] = boost::none;
 	_use_isdcf_name_by_default = true;
 	_write_kdms_to_disk = true;
 	_email_kdms = false;
@@ -194,6 +198,8 @@ Config::set_defaults ()
 	_default_kdm_duration = RoughDuration(1, RoughDuration::Unit::WEEKS);
 	_auto_crop_threshold = 0.1;
 	_last_release_notes_version = boost::none;
+	_allow_smpte_bv20 = false;
+	_isdcf_name_part_length = 14;
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -285,7 +291,7 @@ Config::read_config()
 try
 {
 	cxml::Document f ("Config");
-	f.read_file (config_read_file());
+	f.read_file(dcp::filesystem::fix_long_path(config_read_file()));
 
 	auto version = f.optional_number_child<int> ("Version");
 	if (version && *version < _current_version) {
@@ -617,6 +623,17 @@ try
 	_main_divider_sash_position = f.optional_number_child<int>("MainDividerSashPosition");
 	_main_content_divider_sash_position = f.optional_number_child<int>("MainContentDividerSashPosition");
 
+	if (auto loc = f.optional_string_child("DefaultAddFileLocation")) {
+		if (*loc == "last") {
+			_default_add_file_location = DefaultAddFileLocation::SAME_AS_LAST_TIME;
+		} else if (*loc == "project") {
+			_default_add_file_location = DefaultAddFileLocation::SAME_AS_PROJECT;
+		}
+	}
+
+	_allow_smpte_bv20 = f.optional_bool_child("AllowSMPTEBv20").get_value_or(false);
+	_isdcf_name_part_length = f.optional_number_child<int>("ISDCFNamePartLength").get_value_or(14);
+
 	_export.read(f.optional_node_child("Export"));
 }
 catch (...) {
@@ -637,10 +654,10 @@ catch (...) {
 void
 Config::read_cinemas()
 {
-	if (boost::filesystem::exists (_cinemas_file)) {
+	if (dcp::filesystem::exists(_cinemas_file)) {
 		try {
 			cxml::Document f("Cinemas");
-			f.read_file(_cinemas_file);
+			f.read_file(dcp::filesystem::fix_long_path(_cinemas_file));
 			read_cinemas(f);
 		} catch (...) {
 			backup();
@@ -654,10 +671,10 @@ Config::read_cinemas()
 void
 Config::read_dkdm_recipients()
 {
-	if (boost::filesystem::exists (_dkdm_recipients_file)) {
+	if (dcp::filesystem::exists(_dkdm_recipients_file)) {
 		try {
 			cxml::Document f("DKDMRecipients");
-			f.read_file(_dkdm_recipients_file);
+			f.read_file(dcp::filesystem::fix_long_path(_dkdm_recipients_file));
 			read_dkdm_recipients(f);
 		} catch (...) {
 			backup();
@@ -1094,6 +1111,15 @@ Config::write_config () const
 		root->add_child("MainContentDividerSashPosition")->add_child_text(raw_convert<string>(*_main_content_divider_sash_position));
 	}
 
+	root->add_child("DefaultAddFileLocation")->add_child_text(
+		_default_add_file_location == DefaultAddFileLocation::SAME_AS_LAST_TIME ? "last" : "project"
+		);
+
+	/* [XML] AllowSMPTEBv20 1 to allow the user to choose SMPTE (Bv2.0 only) as a standard, otherwise 0 */
+	root->add_child("AllowSMPTEBv20")->add_child_text(_allow_smpte_bv20 ? "1" : "0");
+	/* [XML] ISDCFNamePartLength Maximum length of the "name" part of an ISDCF name, which should be 14 according to the standard */
+	root->add_child("ISDCFNamePartLength")->add_child_text(raw_convert<string>(_isdcf_name_part_length));
+
 	_export.write(root->add_child("Export"));
 
 	auto target = config_write_file();
@@ -1107,8 +1133,8 @@ Config::write_config () const
 		}
 		f.checked_write(s.c_str(), s.bytes());
 		f.close();
-		boost::filesystem::remove (target);
-		boost::filesystem::rename (tmp, target);
+		dcp::filesystem::remove(target);
+		dcp::filesystem::rename(tmp, target);
 	} catch (xmlpp::exception& e) {
 		string s = e.what ();
 		trim (s);
@@ -1131,8 +1157,8 @@ write_file (string root_node, string node, string version, list<shared_ptr<T>> t
 
 	try {
 		doc.write_to_file_formatted (file.string() + ".tmp");
-		boost::filesystem::remove (file);
-		boost::filesystem::rename (file.string() + ".tmp", file);
+		dcp::filesystem::remove(file);
+		dcp::filesystem::rename(file.string() + ".tmp", file);
 	} catch (xmlpp::exception& e) {
 		string s = e.what ();
 		trim (s);
@@ -1175,7 +1201,7 @@ Config::directory_or (optional<boost::filesystem::path> dir, boost::filesystem::
 	}
 
 	boost::system::error_code ec;
-	auto const e = boost::filesystem::exists (*dir, ec);
+	auto const e = dcp::filesystem::exists(*dir, ec);
 	if (ec || !e) {
 		return a;
 	}
@@ -1270,7 +1296,7 @@ Config::add_to_player_history (boost::filesystem::path p)
 	add_to_history_internal (_player_history, p);
 }
 
-/** Remove non-existant items from the player history */
+/** Remove non-existent items from the player history */
 void
 Config::clean_player_history ()
 {
@@ -1298,7 +1324,7 @@ Config::clean_history_internal (vector<boost::filesystem::path>& h)
 	h.clear ();
 	for (auto i: old) {
 		try {
-			if (boost::filesystem::is_directory(i)) {
+			if (dcp::filesystem::is_directory(i)) {
 				h.push_back (i);
 			}
 		} catch (...) {
@@ -1311,7 +1337,7 @@ Config::clean_history_internal (vector<boost::filesystem::path>& h)
 bool
 Config::have_existing (string file)
 {
-	return boost::filesystem::exists (read_path(file));
+	return dcp::filesystem::exists(read_path(file));
 }
 
 
@@ -1338,10 +1364,10 @@ Config::set_cinemas_file (boost::filesystem::path file)
 
 	_cinemas_file = file;
 
-	if (boost::filesystem::exists (_cinemas_file)) {
+	if (dcp::filesystem::exists(_cinemas_file)) {
 		/* Existing file; read it in */
 		cxml::Document f ("Cinemas");
-		f.read_file (_cinemas_file);
+		f.read_file(dcp::filesystem::fix_long_path(_cinemas_file));
 		read_cinemas (f);
 	}
 
@@ -1370,12 +1396,12 @@ Config::save_template (shared_ptr<const Film> film, string name) const
 list<string>
 Config::templates () const
 {
-	if (!boost::filesystem::exists(read_path("templates"))) {
+	if (!dcp::filesystem::exists(read_path("templates"))) {
 		return {};
 	}
 
 	list<string> n;
-	for (auto const& i: boost::filesystem::directory_iterator(read_path("templates"))) {
+	for (auto const& i: dcp::filesystem::directory_iterator(read_path("templates"))) {
 		n.push_back (i.path().filename().string());
 	}
 	return n;
@@ -1384,7 +1410,7 @@ Config::templates () const
 bool
 Config::existing_template (string name) const
 {
-	return boost::filesystem::exists (template_read_path(name));
+	return dcp::filesystem::exists(template_read_path(name));
 }
 
 
@@ -1405,13 +1431,13 @@ Config::template_write_path (string name) const
 void
 Config::rename_template (string old_name, string new_name) const
 {
-	boost::filesystem::rename (template_read_path(old_name), template_write_path(new_name));
+	dcp::filesystem::rename(template_read_path(old_name), template_write_path(new_name));
 }
 
 void
 Config::delete_template (string name) const
 {
-	boost::filesystem::remove (template_write_path(name));
+	dcp::filesystem::remove(template_write_path(name));
 }
 
 /** @return Path to the config.xml containing the actual settings, following a link if required */
@@ -1419,14 +1445,14 @@ boost::filesystem::path
 config_file (boost::filesystem::path main)
 {
 	cxml::Document f ("Config");
-	if (!boost::filesystem::exists (main)) {
+	if (!dcp::filesystem::exists(main)) {
 		/* It doesn't exist, so there can't be any links; just return it */
 		return main;
 	}
 
 	/* See if there's a link */
 	try {
-		f.read_file (main);
+		f.read_file(dcp::filesystem::fix_long_path(main));
 		auto link = f.optional_string_child("Link");
 		if (link) {
 			return *link;
@@ -1480,7 +1506,7 @@ void
 Config::copy_and_link (boost::filesystem::path new_file) const
 {
 	write ();
-	boost::filesystem::copy_file (config_read_file(), new_file, boost::filesystem::copy_option::overwrite_if_exists);
+	dcp::filesystem::copy_file(config_read_file(), new_file, boost::filesystem::copy_option::overwrite_if_exists);
 	link (new_file);
 }
 
@@ -1585,10 +1611,10 @@ save_all_config_as_zip (boost::filesystem::path zip_file)
 
 	auto config = Config::instance();
 	zipper.add ("config.xml", dcp::file_to_string(config->config_read_file()));
-	if (boost::filesystem::exists(config->cinemas_file())) {
+	if (dcp::filesystem::exists(config->cinemas_file())) {
 		zipper.add ("cinemas.xml", dcp::file_to_string(config->cinemas_file()));
 	}
-	if (boost::filesystem::exists(config->dkdm_recipients_file())) {
+	if (dcp::filesystem::exists(config->dkdm_recipients_file())) {
 		zipper.add ("dkdm_recipients.xml", dcp::file_to_string(config->dkdm_recipients_file()));
 	}