X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=15abff3917635a7ce4ab489962bf54101d723a68;hb=18cb0e914922cd76e9c205e88962816970b5c0cb;hp=0dcc8411775f5f6e138a4055fa0604cf13b239e5;hpb=d461d2685050842cb86875f5a5aa62505779b9ed;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 0dcc84117..15abff391 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -56,8 +56,6 @@ using std::list;
 using std::min;
 using std::max;
 using std::remove;
-using std::exception;
-using std::cerr;
 using std::shared_ptr;
 using std::make_shared;
 using boost::optional;
@@ -103,7 +101,8 @@ Config::set_defaults ()
 	_default_dcp_audio_channels = 6;
 	_default_j2k_bandwidth = 150000000;
 	_default_audio_delay = 0;
-	_default_interop = true;
+	_default_interop = false;
+	_default_metadata.clear ();
 	_upload_after_make_dcp = false;
 	_mail_server = "";
 	_mail_port = 25;
@@ -175,8 +174,8 @@ Config::set_defaults ()
 	_player_playlist_directory = boost::none;
 	_player_kdm_directory = boost::none;
 	_audio_mapping = boost::none;
-	_minimum_frame_size = 65536;
 	_custom_languages.clear ();
+	_add_files_path = boost::none;
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -309,16 +308,15 @@ try
 	_dcp_product_version = f.optional_string_child("DCPProductVersion").get_value_or("");
 	_dcp_j2k_comment = f.optional_string_child("DCPJ2KComment").get_value_or("");
 
-	if (version && version.get() >= 2) {
-		_default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata"));
-	} else {
-		_default_isdcf_metadata = ISDCFMetadata (f.node_child ("DCIMetadata"));
-	}
-
 	_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
 	_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
 	_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
 	_default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false);
+
+	for (auto const& i: f.node_children("DefaultMetadata")) {
+		_default_metadata[i->string_attribute("key")] = i->content();
+	}
+
 	_default_kdm_directory = f.optional_string_child("DefaultKDMDirectory");
 
 	/* Read any cinemas that are still lying around in the config file
@@ -551,8 +549,6 @@ try
 		_audio_mapping = AudioMapping (f.node_child("AudioMapping"), Film::current_state_version);
 	}
 
-	_minimum_frame_size = f.optional_number_child<int>("MinimumFrameSize").get_value_or(65536);
-
 	for (auto i: f.node_children("CustomLanguage")) {
 		try {
 			/* This will fail if it's called before dcp::init() as it won't recognise the
@@ -562,6 +558,8 @@ try
 		} catch (std::runtime_error& e) {}
 	}
 
+	_add_files_path = f.optional_string_child("AddFilesPath");
+
 	if (boost::filesystem::exists (_cinemas_file)) {
 		cxml::Document f ("Cinemas");
 		f.read_file (_cinemas_file);
@@ -688,14 +686,6 @@ Config::write_config () const
 	/* [XML] UploadAfterMakeDCP 1 to upload to a TMS after making a DCP, 0 for no upload. */
 	root->add_child("UploadAfterMakeDCP")->add_child_text (_upload_after_make_dcp ? "1" : "0");
 
-	/* [XML] ISDCFMetadata Default ISDCF metadata to use for new films; child tags are <code>&lt;ContentVersion&gt;</code>,
-	   <code>&lt;AudioLanguage&gt;</code>, <code>&lt;SubtitleLanguage&gt;</code>, <code>&lt;Territory&gt;</code>,
-	   <code>&lt;Rating&gt;</code>, <code>&lt;Studio&gt;</code>, <code>&lt;Facility&gt;</code>, <code>&lt;TempVersion&gt;</code>,
-	   <code>&lt;PreRelease&gt;</code>, <code>&lt;RedBand&gt;</code>, <code>&lt;Chain&gt;</code>, <code>&lt;TwoDVersionOFThreeD&gt;</code>,
-	   <code>&lt;MasteredLuminance&gt;</code>.
-	*/
-	_default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata"));
-
 	/* [XML] DefaultStillLength Default length (in seconds) for still images in new films. */
 	root->add_child("DefaultStillLength")->add_child_text (raw_convert<string> (_default_still_length));
 	/* [XML] DefaultJ2KBandwidth Default bitrate (in bits per second) for JPEG2000 data in new films. */
@@ -704,6 +694,11 @@ 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");
+	for (auto const& i: _default_metadata) {
+		auto c = root->add_child("DefaultMetadata");
+		c->set_attribute("key", i.first);
+		c->add_child_text(i.second);
+	}
 	if (_default_kdm_directory) {
 		/* [XML:opt] DefaultKDMDirectory Default directory to write KDMs to. */
 		root->add_child("DefaultKDMDirectory")->add_child_text (_default_kdm_directory->string ());
@@ -990,10 +985,13 @@ Config::write_config () const
 	if (_audio_mapping) {
 		_audio_mapping->as_xml (root->add_child("AudioMapping"));
 	}
-	root->add_child("MinimumFrameSize")->add_child_text(raw_convert<string>(_minimum_frame_size));
 	for (auto const& i: _custom_languages) {
 		root->add_child("CustomLanguage")->add_child_text(i.to_string());
 	}
+	if (_add_files_path) {
+		/* [XML] 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());
+	}
 
 	try {
 		auto const s = doc.write_to_string_formatted ();