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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5db5cf35f..9e13fd62a 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -140,9 +140,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 +153,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
@@ -189,6 +190,7 @@ Config::set_defaults ()
 	_initial_paths["AddFilesPath"] = 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;
@@ -196,6 +198,7 @@ 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;
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -619,6 +622,16 @@ 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);
+
 	_export.read(f.optional_node_child("Export"));
 }
 catch (...) {
@@ -1096,6 +1109,13 @@ 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");
+
 	_export.write(root->add_child("Export"));
 
 	auto target = config_write_file();